1 files changed, 28 insertions, 1 deletions

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 9c0d76cdca9..fd1aaf2a4a6 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -100,6 +100,29 @@ void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
         mutex_unlock(&sta->ampdu_mlme.mtx);
 }
 
+void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap,
+                                  const u8 *addr)
+{
+        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
+        struct sta_info *sta;
+        int i;
+
+        rcu_read_lock();
+        sta = sta_info_get(sdata, addr);
+        if (!sta) {
+                rcu_read_unlock();
+                return;
+        }
+
+        for (i = 0; i < STA_TID_NUM; i++)
+                if (ba_rx_bitmap & BIT(i))
+                        set_bit(i, sta->ampdu_mlme.tid_rx_stop_requested);
+
+        ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);
+        rcu_read_unlock();
+}
+EXPORT_SYMBOL(ieee80211_stop_rx_ba_session);
+
 /*
  * After accepting the AddBA Request we activated a timer,
  * resetting it after each frame that arrives from the originator.
@@ -247,7 +270,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 */