Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / net / mac80211 / agg-rx.c

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 89b0b2c..ebadb9a 100644 (file)
--- a/net/mac80211/agg-rx.c
+++ b/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 */