summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-09-24 11:21:05 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-09-27 15:57:50 -0400
commit20b01f80f72426e7ed2e773220da4357925383d5 (patch)
treea2e81cf9dec56a8a6b2c739d9eaf59061e700b61 /net/mac80211
parent7c1e183186377e84e6f4e457be0514887f2df4ef (diff)
mac80211: remove prepare_for_handlers sdata argument
The first argument to prepare_for_handlers is always the sdata that can just be stored in rx data directly (and even already is, in two of four code paths.) Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 29a582df637..f59f6f51e39 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2513,10 +2513,10 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
/* main receive path */
-static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata,
- struct ieee80211_rx_data *rx,
+static int prepare_for_handlers(struct ieee80211_rx_data *rx,
struct ieee80211_hdr *hdr)
{
+ struct ieee80211_sub_if_data *sdata = rx->sdata;
struct sk_buff *skb = rx->skb;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
u8 *bssid = ieee80211_get_bssid(hdr, skb->len, sdata->vif.type);
@@ -2656,7 +2656,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
rx.sdata = prev_sta->sdata;
rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(rx.sdata, &rx, hdr);
+ prepares = prepare_for_handlers(&rx, hdr);
if (!prepares)
goto next_sta;
@@ -2690,7 +2690,7 @@ next_sta:
rx.sdata = prev_sta->sdata;
rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(rx.sdata, &rx, hdr);
+ prepares = prepare_for_handlers(&rx, hdr);
if (!prepares)
prev_sta = NULL;
@@ -2733,15 +2733,15 @@ next_sta:
}
rx.sta = sta_info_get_bss(prev, hdr->addr2);
+ rx.sdata = prev;
rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(prev, &rx, hdr);
+ prepares = prepare_for_handlers(&rx, hdr);
if (!prepares)
goto next;
if (status->flag & RX_FLAG_MMIC_ERROR) {
- rx.sdata = prev;
if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr,
&rx);
@@ -2768,15 +2768,15 @@ next:
if (prev) {
rx.sta = sta_info_get_bss(prev, hdr->addr2);
+ rx.sdata = prev;
rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(prev, &rx, hdr);
+ prepares = prepare_for_handlers(&rx, hdr);
if (!prepares)
prev = NULL;
if (prev && status->flag & RX_FLAG_MMIC_ERROR) {
- rx.sdata = prev;
if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr,
&rx);