Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d80050c4 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

iwmc3200wifi: Avoid an offset calculation for each management frame. 



Determine the offset at compile time.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 48631de9

drivers/net/wireless/iwmc3200wifi/rx.c

+12 −13
Original line number Diff line number Diff line
@@ -868,36 +868,35 @@ static int iwm_mlme_mgt_frame(struct iwm_priv *iwm, u8 *buf, 
	struct iwm_umac_notif_mgt_frame *mgt_frame =

			(struct iwm_umac_notif_mgt_frame *)buf;

	struct ieee80211_mgmt *mgt = (struct ieee80211_mgmt *)mgt_frame->frame;

	u8 *ie;



	IWM_HEXDUMP(iwm, DBG, MLME, "MGT: ", mgt_frame->frame,

		    le16_to_cpu(mgt_frame->len));



	if (ieee80211_is_assoc_req(mgt->frame_control)) {

		ie = mgt->u.assoc_req.variable;;

		iwm->req_ie_len =

				le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);

		iwm->req_ie_len = le16_to_cpu(mgt_frame->len)

				  - offsetof(struct ieee80211_mgmt,

					     u.assoc_req.variable);

		kfree(iwm->req_ie);

		iwm->req_ie = kmemdup(mgt->u.assoc_req.variable,

				      iwm->req_ie_len, GFP_KERNEL);

	} else if (ieee80211_is_reassoc_req(mgt->frame_control)) {

		ie = mgt->u.reassoc_req.variable;;

		iwm->req_ie_len =

				le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);

		iwm->req_ie_len = le16_to_cpu(mgt_frame->len)

				  - offsetof(struct ieee80211_mgmt,

					     u.reassoc_req.variable);

		kfree(iwm->req_ie);

		iwm->req_ie = kmemdup(mgt->u.reassoc_req.variable,

				      iwm->req_ie_len, GFP_KERNEL);

	} else if (ieee80211_is_assoc_resp(mgt->frame_control)) {

		ie = mgt->u.assoc_resp.variable;;

		iwm->resp_ie_len =

				le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);

		iwm->resp_ie_len = le16_to_cpu(mgt_frame->len)

				   - offsetof(struct ieee80211_mgmt,

					      u.assoc_resp.variable);

		kfree(iwm->resp_ie);

		iwm->resp_ie = kmemdup(mgt->u.assoc_resp.variable,

				       iwm->resp_ie_len, GFP_KERNEL);

	} else if (ieee80211_is_reassoc_resp(mgt->frame_control)) {

		ie = mgt->u.reassoc_resp.variable;;

		iwm->resp_ie_len =

				le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);

		iwm->resp_ie_len = le16_to_cpu(mgt_frame->len)

				   - offsetof(struct ieee80211_mgmt,

					      u.reassoc_resp.variable);

		kfree(iwm->resp_ie);

		iwm->resp_ie = kmemdup(mgt->u.reassoc_resp.variable,

				       iwm->resp_ie_len, GFP_KERNEL);