evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwmc3200wifi: Avoid an offset calculation for each management frame.

Browse source 
Determine the offset at compile time.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Joe Perches 2009-12-02 20:56:11 -08:00 • committed by John W. Linville
parent 48631de921
commit d80050c4c3
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/net/wireless/iwmc3200wifi/rx.c
View file

@ -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 *mgt_frame =
(struct iwm_umac_notif_mgt_frame *)buf; (struct iwm_umac_notif_mgt_frame *)buf;
struct ieee80211_mgmt *mgt = (struct ieee80211_mgmt *)mgt_frame->frame; struct ieee80211_mgmt *mgt = (struct ieee80211_mgmt *)mgt_frame->frame;
u8 *ie;
IWM_HEXDUMP(iwm, DBG, MLME, "MGT: ", mgt_frame->frame, IWM_HEXDUMP(iwm, DBG, MLME, "MGT: ", mgt_frame->frame,
le16_to_cpu(mgt_frame->len)); le16_to_cpu(mgt_frame->len));
if (ieee80211_is_assoc_req(mgt->frame_control)) { if (ieee80211_is_assoc_req(mgt->frame_control)) {
ie = mgt->u.assoc_req.variable;; iwm->req_ie_len = le16_to_cpu(mgt_frame->len)
iwm->req_ie_len = - offsetof(struct ieee80211_mgmt,
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt); u.assoc_req.variable);
kfree(iwm->req_ie); kfree(iwm->req_ie);
iwm->req_ie = kmemdup(mgt->u.assoc_req.variable, iwm->req_ie = kmemdup(mgt->u.assoc_req.variable,
iwm->req_ie_len, GFP_KERNEL); iwm->req_ie_len, GFP_KERNEL);
} else if (ieee80211_is_reassoc_req(mgt->frame_control)) { } 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)
iwm->req_ie_len = - offsetof(struct ieee80211_mgmt,
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt); u.reassoc_req.variable);
kfree(iwm->req_ie); kfree(iwm->req_ie);
iwm->req_ie = kmemdup(mgt->u.reassoc_req.variable, iwm->req_ie = kmemdup(mgt->u.reassoc_req.variable,
iwm->req_ie_len, GFP_KERNEL); iwm->req_ie_len, GFP_KERNEL);
} else if (ieee80211_is_assoc_resp(mgt->frame_control)) { } 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)
iwm->resp_ie_len = - offsetof(struct ieee80211_mgmt,
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt); u.assoc_resp.variable);
kfree(iwm->resp_ie); kfree(iwm->resp_ie);
iwm->resp_ie = kmemdup(mgt->u.assoc_resp.variable, iwm->resp_ie = kmemdup(mgt->u.assoc_resp.variable,
iwm->resp_ie_len, GFP_KERNEL); iwm->resp_ie_len, GFP_KERNEL);
} else if (ieee80211_is_reassoc_resp(mgt->frame_control)) { } 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)
iwm->resp_ie_len = - offsetof(struct ieee80211_mgmt,
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt); u.reassoc_resp.variable);
kfree(iwm->resp_ie); kfree(iwm->resp_ie);
iwm->resp_ie = kmemdup(mgt->u.reassoc_resp.variable, iwm->resp_ie = kmemdup(mgt->u.reassoc_resp.variable,
iwm->resp_ie_len, GFP_KERNEL); iwm->resp_ie_len, GFP_KERNEL);