Remove double semicolons
PATCH 1/1 Remove double semicolons
This patches eliminates a few double semicolons in the IWMC3200 driver.
Signed-off-by John Daiker <[email protected]>
--- drivers/net/wireless/iwmc3200wifi/rx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/iwmc3200wifi/rx.c +4 -4
@@ -874,28 +874,28 @@ static int iwm_mlme_mgt_frame(struct iwm_priv *iwm, u8 *buf, le16_to_cpu(mgt_frame->len));if (ieee80211_is_assoc_req (mgt->frame_control)) { - ie = mgt->u.assoc_req.variable;; + ie = mgt->u.assoc_req.variable; iwm->req_ie_len =le16_to_cpu (mgt_frame->len) - (ie - (u8 *)mgt);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;; + ie = mgt->u.reassoc_req.variable; iwm->req_ie_len =le16_to_cpu (mgt_frame->len) - (ie - (u8 *)mgt);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;; + ie = mgt->u.assoc_resp.variable; iwm->resp_ie_len =le16_to_cpu (mgt_frame->len) - (ie - (u8 *)mgt);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;; + ie = mgt->u.reassoc_resp.variable; iwm->resp_ie_len =le16_to_cpu (mgt_frame->len) - (ie - (u8 *)mgt);kfree (iwm->resp_ie);
Signature · 1 line
1.6.3.3
Quoted 1 line · John Daiker
This patches eliminates a few double semicolons in the IWMC3200 driver.
How about this instead:
Avoid an offset calculation for each management frame. Determine the offset at compile time.
Signed-off-by Joe Perches <[email protected]>
drivers/net/wireless/iwmc3200wifi/rx.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-)
drivers/net/wireless/iwmc3200wifi/rx.c +12 -13
@@ -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 );
Zhu Yi
Acked-byQuoted 10 lines · Joe Perches
Quoted 1 line · John Daiker
This patches eliminates a few double semicolons in the IWMC3200
driver.
How about this instead:
Avoid an offset calculation for each management frame. Determine the offset at compile time.
Signed-off-by Joe Perches <[email protected]>
Acked-by Zhu Yi <[email protected]>
Thanks,
-yi