From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 27 Jun 2011 09:31:09 +0000 (+0000)
Subject: mac80211: merge a pending fix for reestablishing misconfigured aggregation sessions
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=baf642382759f385610fca039fec38fb19ab6979;p=openwrt%2Fstaging%2F981213.git

mac80211: merge a pending fix for reestablishing misconfigured aggregation sessions

SVN-Revision: 27292
---

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 4f9138cbc7..8e78e1fba3 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -9,6 +9,19 @@
  
  	mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
  					  IEEE80211_STYPE_ACTION);
+@@ -262,7 +264,11 @@ void ieee80211_process_addba_request(str
+ 				"%pM on tid %u\n",
+ 				mgmt->sa, tid);
+ #endif /* CONFIG_MAC80211_HT_DEBUG */
+-		goto end;
++
++		/* delete existing Rx BA session on the same tid */
++		___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
++						WLAN_STATUS_UNSPECIFIED_QOS,
++						false);
+ 	}
+ 
+ 	/* prepare A-MPDU MLME for Rx aggregation */
 --- a/net/mac80211/agg-tx.c
 +++ b/net/mac80211/agg-tx.c
 @@ -79,7 +79,8 @@ static void ieee80211_send_addba_request