diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:02 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-01-07 14:39:16 +0100 |
| commit | 3a4b0c948d286523ba062985c03487b55326eaae (patch) | |
| tree | 8c61bbeb09f9d810d3132919c22e8effcc4e545c /net/mac80211/rx.c | |
| parent | fa44b988d2da58334ecbcf3e00f9acccbdeace6c (diff) | |
| parent | 1e359a5de861a57aa04d92bb620f52a5c1d7f8b1 (diff) | |
| download | linux-stable-3a4b0c948d286523ba062985c03487b55326eaae.tar.gz linux-stable-3a4b0c948d286523ba062985c03487b55326eaae.tar.bz2 linux-stable-3a4b0c948d286523ba062985c03487b55326eaae.zip | |
Merge branch 'mac80211' into mac80211-next
Merge mac80211.git to get some changes that would otherwise
cause conflicts with new changes coming here.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 444ebff955c1..fa5d870655a9 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1761,14 +1761,14 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) sc = le16_to_cpu(hdr->seq_ctrl); frag = sc & IEEE80211_SCTL_FRAG; - if (likely(!ieee80211_has_morefrags(fc) && frag == 0)) - goto out; - if (is_multicast_ether_addr(hdr->addr1)) { rx->local->dot11MulticastReceivedFrameCount++; - goto out; + goto out_no_led; } + if (likely(!ieee80211_has_morefrags(fc) && frag == 0)) + goto out; + I802_DEBUG_INC(rx->local->rx_handlers_fragments); if (skb_linearize(rx->skb)) @@ -1859,9 +1859,10 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx) status->rx_flags |= IEEE80211_RX_FRAGMENTED; out: + ieee80211_led_rx(rx->local); + out_no_led: if (rx->sta) rx->sta->rx_packets++; - ieee80211_led_rx(rx->local); return RX_CONTINUE; } |