aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-06-27 09:31:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-06-27 09:31:09 +0000
commit98360e16e40d199f441dcaab7b5e0523b44d06e1 (patch)
tree9759738a3f714a9629ed23b1b467e8d873b46388
parent9f22101e624b06c01354f89a06ffe7902d2cde62 (diff)
downloadupstream-98360e16e40d199f441dcaab7b5e0523b44d06e1.tar.gz
upstream-98360e16e40d199f441dcaab7b5e0523b44d06e1.tar.bz2
upstream-98360e16e40d199f441dcaab7b5e0523b44d06e1.zip
mac80211: merge a pending fix for reestablishing misconfigured aggregation sessions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27292 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/300-pending_work.patch13
1 files changed, 13 insertions, 0 deletions
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