diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
| commit | e08fd975bf26aa8063cadd245817e042f570472d (patch) | |
| tree | 2b2a705710e6374cc037f89bcc7bfc25047485ba /net/mac80211/rx.c | |
| parent | 251c9ba19143caa5eb5b6ec52c77c70c9d7b3d8f (diff) | |
| parent | a59b40b30f3f51bf5c56c15a7dc4da11b424a34b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
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 30ac6099da06..2dfa75522733 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -924,7 +924,8 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx, | |||
| 924 | u16 sc; | 924 | u16 sc; |
| 925 | u8 tid, ack_policy; | 925 | u8 tid, ack_policy; |
| 926 | 926 | ||
| 927 | if (!ieee80211_is_data_qos(hdr->frame_control)) | 927 | if (!ieee80211_is_data_qos(hdr->frame_control) || |
| 928 | is_multicast_ether_addr(hdr->addr1)) | ||
| 928 | goto dont_reorder; | 929 | goto dont_reorder; |
| 929 | 930 | ||
| 930 | /* | 931 | /* |