summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c165
1 files changed, 62 insertions, 103 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f59f6f51e39..13311f8960a 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2443,18 +2443,13 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx,
}
}
-static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
- struct ieee80211_rx_data *rx,
- struct sk_buff *skb)
+static void ieee80211_invoke_rx_handlers(struct ieee80211_rx_data *rx)
{
struct sk_buff_head reorder_release;
ieee80211_rx_result res = RX_DROP_MONITOR;
__skb_queue_head_init(&reorder_release);
- rx->skb = skb;
- rx->sdata = sdata;
-
#define CALL_RXH(rxh) \
do { \
res = rxh(rx); \
@@ -2598,21 +2593,63 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,
}
/*
+ * This function returns whether or not the SKB
+ * was destined for RX processing or not, which,
+ * if consume is true, is equivalent to whether
+ * or not the skb was consumed.
+ */
+static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
+ struct sk_buff *skb, bool consume)
+{
+ struct ieee80211_local *local = rx->local;
+ struct ieee80211_sub_if_data *sdata = rx->sdata;
+ struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
+ struct ieee80211_hdr *hdr = (void *)skb->data;
+ int prepares;
+
+ rx->skb = skb;
+ rx->flags |= IEEE80211_RX_RA_MATCH;
+ prepares = prepare_for_handlers(rx, hdr);
+
+ if (!prepares)
+ return false;
+
+ if (status->flag & RX_FLAG_MMIC_ERROR) {
+ if (rx->flags & IEEE80211_RX_RA_MATCH)
+ ieee80211_rx_michael_mic_report(hdr, rx);
+ return false;
+ }
+
+ if (!consume) {
+ skb = skb_copy(skb, GFP_ATOMIC);
+ if (!skb) {
+ if (net_ratelimit())
+ wiphy_debug(local->hw.wiphy,
+ "failed to copy multicast frame for %s\n",
+ sdata->name);
+ return true;
+ }
+
+ rx->skb = skb;
+ }
+
+ ieee80211_invoke_rx_handlers(rx);
+ return true;
+}
+
+/*
* This is the actual Rx frames handler. as it blongs to Rx path it must
* be called with rcu_read_lock protection.
*/
static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
struct sk_buff *skb)
{
- struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_sub_if_data *sdata;
struct ieee80211_hdr *hdr;
__le16 fc;
struct ieee80211_rx_data rx;
- int prepares;
- struct ieee80211_sub_if_data *prev = NULL;
- struct sk_buff *skb_new;
+ struct ieee80211_sub_if_data *prev;
struct sta_info *sta, *tmp, *prev_sta;
bool found_sta = false;
int err = 0;
@@ -2645,8 +2682,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
if (ieee80211_is_data(fc)) {
prev_sta = NULL;
+
for_each_sta_info(local, hdr->addr2, sta, tmp) {
found_sta = true;
+
if (!prev_sta) {
prev_sta = sta;
continue;
@@ -2654,65 +2693,23 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
rx.sta = prev_sta;
rx.sdata = prev_sta->sdata;
+ ieee80211_prepare_and_rx_handle(&rx, skb, false);
- rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(&rx, hdr);
- if (!prepares)
- goto next_sta;
-
- if (status->flag & RX_FLAG_MMIC_ERROR) {
- if (rx.flags & IEEE80211_RX_RA_MATCH)
- ieee80211_rx_michael_mic_report(hdr, &rx);
- goto next_sta;
- }
-
- /*
- * frame was destined for the previous interface
- * so invoke RX handlers for it
- */
- skb_new = skb_copy(skb, GFP_ATOMIC);
- if (!skb_new) {
- if (net_ratelimit())
- wiphy_debug(local->hw.wiphy,
- "failed to copy multicast"
- " frame for %s\n",
- prev_sta->sdata->name);
- goto next_sta;
- }
- ieee80211_invoke_rx_handlers(prev_sta->sdata, &rx,
- skb_new);
-next_sta:
prev_sta = sta;
- } /* for all STA info */
+ }
if (prev_sta) {
rx.sta = prev_sta;
rx.sdata = prev_sta->sdata;
- rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(&rx, hdr);
- if (!prepares)
- prev_sta = NULL;
-
- if (prev_sta && status->flag & RX_FLAG_MMIC_ERROR) {
- if (rx.flags & IEEE80211_RX_RA_MATCH)
- ieee80211_rx_michael_mic_report(hdr, &rx);
- prev_sta = NULL;
- }
- }
-
-
- if (prev_sta) {
- ieee80211_invoke_rx_handlers(prev_sta->sdata, &rx, skb);
- return;
- } else {
- if (found_sta) {
- dev_kfree_skb(skb);
+ if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
return;
- }
}
- } /* if data frame */
+ }
+
if (!found_sta) {
+ prev = NULL;
+
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (!ieee80211_sdata_running(sdata))
continue;
@@ -2734,35 +2731,8 @@ next_sta:
rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;
+ ieee80211_prepare_and_rx_handle(&rx, skb, false);
- rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(&rx, hdr);
-
- if (!prepares)
- goto next;
-
- if (status->flag & RX_FLAG_MMIC_ERROR) {
- if (rx.flags & IEEE80211_RX_RA_MATCH)
- ieee80211_rx_michael_mic_report(hdr,
- &rx);
- goto next;
- }
-
- /*
- * frame was destined for the previous interface
- * so invoke RX handlers for it
- */
-
- skb_new = skb_copy(skb, GFP_ATOMIC);
- if (!skb_new) {
- if (net_ratelimit())
- wiphy_debug(local->hw.wiphy,
- "failed to copy multicast frame for %s\n",
- prev->name);
- goto next;
- }
- ieee80211_invoke_rx_handlers(prev, &rx, skb_new);
-next:
prev = sdata;
}
@@ -2770,24 +2740,13 @@ next:
rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;
- rx.flags |= IEEE80211_RX_RA_MATCH;
- prepares = prepare_for_handlers(&rx, hdr);
-
- if (!prepares)
- prev = NULL;
-
- if (prev && status->flag & RX_FLAG_MMIC_ERROR) {
- if (rx.flags & IEEE80211_RX_RA_MATCH)
- ieee80211_rx_michael_mic_report(hdr,
- &rx);
- prev = NULL;
- }
+ if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
+ return;
}
+
}
- if (prev)
- ieee80211_invoke_rx_handlers(prev, &rx, skb);
- else
- dev_kfree_skb(skb);
+
+ dev_kfree_skb(skb);
}
/*
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 15:29:03 +0000