|
|
@ -3178,6 +3178,16 @@ |
|
|
|
|
|
|
|
|
|
|
|
/* check if we already stored this frame */
|
|
|
|
/* check if we already stored this frame */
|
|
|
|
if (tid_agg_rx->reorder_buf[index]) {
|
|
|
|
if (tid_agg_rx->reorder_buf[index]) {
|
|
|
|
|
|
|
|
@@ -911,7 +903,8 @@ static void ieee80211_rx_reorder_ampdu(s
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
--- a/net/mac80211/scan.c
|
|
|
|
--- a/net/mac80211/scan.c
|
|
|
|
+++ b/net/mac80211/scan.c
|
|
|
|
+++ b/net/mac80211/scan.c
|
|
|
|
@@ -526,7 +526,7 @@ static int __ieee80211_start_scan(struct
|
|
|
|
@@ -526,7 +526,7 @@ static int __ieee80211_start_scan(struct
|
|
|
|