Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12811037 authored by Ilan peer's avatar Ilan peer Committed by Johannes Berg
Browse files

mac80211: Simplify locking in ieee80211_sta_tear_down_BA_sessions() 



Simplify the locking in  ieee80211_sta_tear_down_BA_sessions() and
lock sta->ampdu_mlme.mtx over the entire function instead of
locking/unlocking it for each TID etc.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1272c5d8

net/mac80211/ht.c

+7 −5
Original line number Diff line number Diff line
@@ -290,13 +290,15 @@ void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta, 
{

	int i;



	mutex_lock(&sta->ampdu_mlme.mtx);

	for (i = 0; i <  IEEE80211_NUM_TIDS; i++) {

		__ieee80211_stop_tx_ba_session(sta, i, reason);

		__ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT,

		___ieee80211_stop_tx_ba_session(sta, i, reason);

		___ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT,

						WLAN_REASON_QSTA_LEAVE_QBSS,

						reason != AGG_STOP_DESTROY_STA &&

						reason != AGG_STOP_PEER_REQUEST);

	}

	mutex_unlock(&sta->ampdu_mlme.mtx);



	/* stopping might queue the work again - so cancel only afterwards */

	cancel_work_sync(&sta->ampdu_mlme.work);