mac80211: send delBA on unexpected BlockAck Request
authorJohannes Berg <johannes.berg@intel.com>
Mon, 29 Aug 2016 20:25:19 +0000 (23:25 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 12 Sep 2016 09:46:31 +0000 (11:46 +0200)
If we don't have a BA session, send delBA, as requested by the
IEEE 802.11 spec. Apply the same limit of sending such a delBA
only once as in the previous patch.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/rx.c

index ad636c930f8438e3763b81c025aba47f73548244..e796060b7c5ee219d50ee6c58a732281edd3eb72 100644 (file)
@@ -2592,6 +2592,12 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx, struct sk_buff_head *frames)
 
                tid = le16_to_cpu(bar_data.control) >> 12;
 
+               if (!test_bit(tid, rx->sta->ampdu_mlme.agg_session_valid) &&
+                   !test_and_set_bit(tid, rx->sta->ampdu_mlme.unexpected_agg))
+                       ieee80211_send_delba(rx->sdata, rx->sta->sta.addr, tid,
+                                            WLAN_BACK_RECIPIENT,
+                                            WLAN_REASON_QSTA_REQUIRE_SETUP);
+
                tid_agg_rx = rcu_dereference(rx->sta->ampdu_mlme.tid_rx[tid]);
                if (!tid_agg_rx)
                        return RX_DROP_MONITOR;