mac80211: agg-rx: Accept ADDBA request update if timeout did not change (21b7022f) · Commits · 戴 / test

As there is no support for updating an existing ADDBA session with a peer, we decline the request (while keeping the session active). However, in case that the timeout did not change, there is no need to decline the request, so modify the code to reply with status success in such a case (this is useful for interoperability with APs that send an ADDBA request update without changing the timeout value). Signed-off-by:

Ilan Peer <ilan.peer@intel.com> Signed-off-by:

Luca Coelho <luciano.coelho@intel.com> Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/agg-rx.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -298,13 +298,23 @@ void ___ieee80211_start_rx_ba_session(struct sta_info *sta,

		if (test_bit(tid, sta->ampdu_mlme.agg_session_valid)) {
		if (sta->ampdu_mlme.tid_rx_token[tid] == dialog_token) {
		struct tid_ampdu_rx *tid_rx;

		ht_dbg_ratelimited(sta->sdata,
		"updated AddBA Req from %pM on tid %u\n",
		sta->sta.addr, tid);
		/* We have no API to update the timeout value in the
		* driver so reject the timeout update.
		* driver so reject the timeout update if the timeout
		* changed. If if did not change, i.e., no real update,
		* just reply with success.
		*/
		rcu_read_lock();
		tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[tid]);
		if (tid_rx && tid_rx->timeout == timeout)
		status = WLAN_STATUS_SUCCESS;
		else
		status = WLAN_STATUS_REQUEST_DECLINED;
		rcu_read_unlock();
		goto end;
		}

Admin message