diff options
| author | Luis Claudio R. Goncalves <lgoncalv@redhat.com> | 2021-07-05 18:04:52 -0300 |
|---|---|---|
| committer | Luis Claudio R. Goncalves <lgoncalv@redhat.com> | 2021-07-05 18:04:52 -0300 |
| commit | 0322213bc5cb16a66542210609f5711ed3e694fc (patch) | |
| tree | d8bc9825f750610103d1ff0361931aa6fa51d3d0 /net/mac80211/rx.c | |
| parent | 833eba2b0c502b720a40ddb890f65c670ff67b72 (diff) | |
| parent | ebeed1e38d45d31da241fd1e4a93c0517a6cb6cf (diff) | |
| download | linux-rt-0322213bc5cb16a66542210609f5711ed3e694fc.tar.gz | |
Merge tag 'v4.9.274' into v4.9-rt
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 28dcd26d6622..34fc53be1ff0 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1988,17 +1988,15 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) sc = le16_to_cpu(hdr->seq_ctrl); frag = sc & IEEE80211_SCTL_FRAG; - if (is_multicast_ether_addr(hdr->addr1)) { - I802_DEBUG_INC(rx->local->dot11MulticastReceivedFrameCount); - goto out_no_led; - } - if (rx->sta) cache = &rx->sta->frags; if (likely(!ieee80211_has_morefrags(fc) && frag == 0)) goto out; + if (is_multicast_ether_addr(hdr->addr1)) + return RX_DROP_MONITOR; + I802_DEBUG_INC(rx->local->rx_handlers_fragments); if (skb_linearize(rx->skb)) @@ -2127,7 +2125,6 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) out: ieee80211_led_rx(rx->local); - out_no_led: if (rx->sta) rx->sta->rx_stats.packets++; return RX_CONTINUE; |