android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: remove prepare_for_handlers sdata argument

Browse Source 
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>
This commit is contained in:
Johannes Berg 2010-09-24 11:21:05 +02:00 committed by John W. Linville
parent 7c1e183186
commit 20b01f80f7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/mac80211/rx.c
View File

@ -2513,10 +2513,10 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
/* main receive path */ /* main receive path */
static int prepare_for_handlers(struct ieee80211_sub_if_data *sdata, static int prepare_for_handlers(struct ieee80211_rx_data *rx,
struct ieee80211_rx_data *rx,
struct ieee80211_hdr *hdr) struct ieee80211_hdr *hdr)
{ {
struct ieee80211_sub_if_data *sdata = rx->sdata;
struct sk_buff *skb = rx->skb; struct sk_buff *skb = rx->skb;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
u8 *bssid = ieee80211_get_bssid(hdr, skb->len, sdata->vif.type); 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.sdata = prev_sta->sdata;
rx.flags |= IEEE80211_RX_RA_MATCH; rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(rx.sdata, &rx, hdr); prepares = prepare_for_handlers(&rx, hdr);
if (!prepares) if (!prepares)
goto next_sta; goto next_sta;
@ -2690,7 +2690,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
rx.sdata = prev_sta->sdata; rx.sdata = prev_sta->sdata;
rx.flags |= IEEE80211_RX_RA_MATCH; rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(rx.sdata, &rx, hdr); prepares = prepare_for_handlers(&rx, hdr);
if (!prepares) if (!prepares)
prev_sta = NULL; prev_sta = NULL;
@ -2733,15 +2733,15 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
} }
rx.sta = sta_info_get_bss(prev, hdr->addr2); rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;
rx.flags |= IEEE80211_RX_RA_MATCH; rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(prev, &rx, hdr); prepares = prepare_for_handlers(&rx, hdr);
if (!prepares) if (!prepares)
goto next; goto next;
if (status->flag & RX_FLAG_MMIC_ERROR) { if (status->flag & RX_FLAG_MMIC_ERROR) {
rx.sdata = prev;
if (rx.flags & IEEE80211_RX_RA_MATCH) if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr, ieee80211_rx_michael_mic_report(hdr,
&rx); &rx);
@ -2768,15 +2768,15 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
if (prev) { if (prev) {
rx.sta = sta_info_get_bss(prev, hdr->addr2); rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;
rx.flags |= IEEE80211_RX_RA_MATCH; rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(prev, &rx, hdr); prepares = prepare_for_handlers(&rx, hdr);
if (!prepares) if (!prepares)
prev = NULL; prev = NULL;
if (prev && status->flag & RX_FLAG_MMIC_ERROR) { if (prev && status->flag & RX_FLAG_MMIC_ERROR) {
rx.sdata = prev;
if (rx.flags & IEEE80211_RX_RA_MATCH) if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr, ieee80211_rx_michael_mic_report(hdr,
&rx); &rx);