From d20cbcbe8047bc659aaaa1f456dd316c082373aa Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Thu, 23 Jun 2011 01:15:27 +0300
Subject: [PATCH] --- yaml --- r: 256083 b: refs/heads/master c:
 15b4d843ab66bc0ac2cd46baa20a3ce9638604e6 h: refs/heads/master i:   256081:
 f29b0a7119da9cfb0c6cbca6d9c1dd9631681bbb   256079:
 48a3efaa3be02c4a0dbb6e218ee5dfe0f34528aa v: v3

---
 [refs]                      | 2 +-
 trunk/net/mac80211/agg-rx.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b9611356dd2c..423ff9e223e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daf4ce85cd5221a3609e68419d01730170975e94
+refs/heads/master: 15b4d843ab66bc0ac2cd46baa20a3ce9638604e6
diff --git a/trunk/net/mac80211/agg-rx.c b/trunk/net/mac80211/agg-rx.c
index 89b0b2ca6db6..ebadb9ac9a7e 100644
--- a/trunk/net/mac80211/agg-rx.c
+++ b/trunk/net/mac80211/agg-rx.c
@@ -262,7 +262,11 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 				"%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 */