forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

Browse source
This commit is contained in:
Johannes Berg 2013-12-16 11:23:45 +01:00
commit c4de673b77
9115 changed files with 357063 additions and 191659 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/mac80211/rx.c
View file

@ -924,7 +924,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;
/*