* [PATCH] Remove double semicolons @ 2009-12-03 4:14 John Daiker 2009-12-03 4:56 ` Joe Perches 0 siblings, 1 reply; 3+ messages in thread From: John Daiker @ 2009-12-03 4:14 UTC (permalink / raw) To: linux-wireless; +Cc: samuel.ortiz, yi.zhu, John Daiker This patches eliminates a few double semicolons in the IWMC3200 driver. Signed-off-by: John Daiker <daikerjohn@gmail.com> --- drivers/net/wireless/iwmc3200wifi/rx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index 72c27a3..5e3cf5e 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c @@ -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); -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Remove double semicolons 2009-12-03 4:14 [PATCH] Remove double semicolons John Daiker @ 2009-12-03 4:56 ` Joe Perches 2009-12-03 5:36 ` Zhu Yi 0 siblings, 1 reply; 3+ messages in thread From: Joe Perches @ 2009-12-03 4:56 UTC (permalink / raw) To: John Daiker; +Cc: linux-wireless, samuel.ortiz, yi.zhu On Wed, 2009-12-02 at 20:14 -0800, John Daiker wrote: > 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 <joe@perches.com> drivers/net/wireless/iwmc3200wifi/rx.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index bdb1d7e..097144a 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c @@ -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); ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Remove double semicolons 2009-12-03 4:56 ` Joe Perches @ 2009-12-03 5:36 ` Zhu Yi 0 siblings, 0 replies; 3+ messages in thread From: Zhu Yi @ 2009-12-03 5:36 UTC (permalink / raw) To: Joe Perches; +Cc: John Daiker, linux-wireless@vger.kernel.org, Ortiz, Samuel On Thu, 2009-12-03 at 12:56 +0800, Joe Perches wrote: > On Wed, 2009-12-02 at 20:14 -0800, John Daiker wrote: > > 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 <joe@perches.com> Acked-by: Zhu Yi <yi.zhu@intel.com> Thanks, -yi ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-03 5:36 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-12-03 4:14 [PATCH] Remove double semicolons John Daiker 2009-12-03 4:56 ` Joe Perches 2009-12-03 5:36 ` Zhu Yi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox