From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 20 Nov 2013 17:33:50 +0000 (+0000)
Subject: mac80211: fix reorder issues with multicast packets (client mode)
X-Git-Tag: reboot~8560
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0707c6810a179fb45be887b6cb2d2010101ac760;p=openwrt%2Fstaging%2Fchunkeey.git

mac80211: fix reorder issues with multicast packets (client mode)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 38883
---

diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
index 60a06c60ff..962c5e848b 100644
--- a/package/kernel/mac80211/patches/300-pending_work.patch
+++ b/package/kernel/mac80211/patches/300-pending_work.patch
@@ -3178,6 +3178,16 @@
  
  	/* check if we already stored this frame */
  	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
 +++ b/net/mac80211/scan.c
 @@ -526,7 +526,7 @@ static int __ieee80211_start_scan(struct