diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-05 09:29:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-05 09:29:56 -0500 |
| commit | aa489f0f268595bd33d9649030bd1a43c28927a0 (patch) | |
| tree | 598cb96d4b22749e07116cb4006d71fb5a5704ea /net/mac80211/rx.c | |
| parent | 988bf4f01e6a1eefdedd76e961044f01fe6a304c (diff) | |
| parent | a59b40b30f3f51bf5c56c15a7dc4da11b424a34b (diff) | |
| download | linux-aa489f0f268595bd33d9649030bd1a43c28927a0.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index caecef870c0e..2b0debb0422b 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -911,7 +911,8 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx, u16 sc; u8 tid, ack_policy; - if (!ieee80211_is_data_qos(hdr->frame_control)) + if (!ieee80211_is_data_qos(hdr->frame_control) || + is_multicast_ether_addr(hdr->addr1)) goto dont_reorder; /* |