diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-01-31 19:48:26 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-29 21:37:03 +0100 |
commit | 8944b79fe9b1fe249c599e7e51f1bfad539aab6d (patch) | |
tree | 3a3b0e66b44c874306ca81f1ff24177c74a19354 /net | |
parent | mac80211: remove "dynamic" RX/TX handlers (diff) | |
download | linux-8944b79fe9b1fe249c599e7e51f1bfad539aab6d.tar.xz linux-8944b79fe9b1fe249c599e7e51f1bfad539aab6d.zip |
mac80211: move some code into ieee80211_invoke_rx_handlers
There is some duplicated code that sits in front of each function
call to ieee80211_invoke_rx_handlers() that can very well be part
of that function if it gets slightly different arguments.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/rx.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 0ab9fef8ea8b..3a3112f17832 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1450,7 +1450,6 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx) static void ieee80211_rx_michael_mic_report(struct net_device *dev, struct ieee80211_hdr *hdr, - struct sta_info *sta, struct ieee80211_txrx_data *rx) { int keyidx, hdrlen; @@ -1469,7 +1468,7 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev, dev->name, print_mac(mac, hdr->addr2), print_mac(mac2, hdr->addr1), keyidx); - if (!sta) { + if (!rx->sta) { /* * Some hardware seem to generate incorrect Michael MIC * reports; ignore them to avoid triggering countermeasures. @@ -1544,13 +1543,17 @@ static ieee80211_rx_handler ieee80211_rx_handlers[] = NULL }; -static void ieee80211_invoke_rx_handlers(struct ieee80211_local *local, +static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata, struct ieee80211_txrx_data *rx, - struct sta_info *sta) + struct sk_buff *skb) { ieee80211_rx_handler *handler; ieee80211_rx_result res = RX_DROP_MONITOR; + rx->skb = skb; + rx->sdata = sdata; + rx->dev = sdata->dev; + for (handler = ieee80211_rx_handlers; *handler != NULL; handler++) { res = (*handler)(rx); @@ -1559,12 +1562,12 @@ static void ieee80211_invoke_rx_handlers(struct ieee80211_local *local, continue; case RX_DROP_UNUSABLE: case RX_DROP_MONITOR: - I802_DEBUG_INC(local->rx_handlers_drop); - if (sta) - sta->rx_dropped++; + I802_DEBUG_INC(sdata->local->rx_handlers_drop); + if (rx->sta) + rx->sta->rx_dropped++; break; case RX_QUEUED: - I802_DEBUG_INC(local->rx_handlers_queued); + I802_DEBUG_INC(sdata->local->rx_handlers_queued); break; } break; @@ -1669,7 +1672,6 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, { struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_sub_if_data *sdata; - struct sta_info *sta; struct ieee80211_hdr *hdr; struct ieee80211_txrx_data rx; u16 type; @@ -1692,14 +1694,14 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, if (type == IEEE80211_FTYPE_DATA || type == IEEE80211_FTYPE_MGMT) local->dot11ReceivedFragmentCount++; - sta = rx.sta = sta_info_get(local, hdr->addr2); - if (sta) { + rx.sta = sta_info_get(local, hdr->addr2); + if (rx.sta) { rx.dev = rx.sta->dev; rx.sdata = IEEE80211_DEV_TO_SUB_IF(rx.dev); } if ((status->flag & RX_FLAG_MMIC_ERROR)) { - ieee80211_rx_michael_mic_report(local->mdev, hdr, sta, &rx); + ieee80211_rx_michael_mic_report(local->mdev, hdr, &rx); goto end; } @@ -1721,8 +1723,6 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, bssid = ieee80211_get_bssid(hdr, skb->len, sdata->vif.type); rx.flags |= IEEE80211_TXRXD_RXRA_MATCH; prepares = prepare_for_handlers(sdata, bssid, &rx, hdr); - /* prepare_for_handlers can change sta */ - sta = rx.sta; if (!prepares) continue; @@ -1753,24 +1753,18 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, continue; } rx.fc = le16_to_cpu(hdr->frame_control); - rx.skb = skb_new; - rx.dev = prev->dev; - rx.sdata = prev; - ieee80211_invoke_rx_handlers(local, &rx, sta); + ieee80211_invoke_rx_handlers(prev, &rx, skb_new); prev = sdata; } if (prev) { rx.fc = le16_to_cpu(hdr->frame_control); - rx.skb = skb; - rx.dev = prev->dev; - rx.sdata = prev; - ieee80211_invoke_rx_handlers(local, &rx, sta); + ieee80211_invoke_rx_handlers(prev, &rx, skb); } else dev_kfree_skb(skb); end: - if (sta) - sta_info_put(sta); + if (rx.sta) + sta_info_put(rx.sta); } #define SEQ_MODULO 0x1000 |