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

Commit 2aab4c27 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: fix stopping RX BA session from timer 



Kalle reported that his system deadlocks since my
recent work in this area. The reason quickly became
apparent: we try to cancel_timer_sync() a timer
from within itself. Fix that by making the function
aware of the context it is called from.

Reported-by: default avatarKalle Valo <kvalo@adurom.com>
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Tested-by: default avatarKalle Valo <kvalo@adurom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 93d95b12

net/mac80211/agg-rx.c

+13 −5
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ 
#include "ieee80211_i.h"

#include "driver-ops.h"



void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,

				    u16 initiator, u16 reason)

static void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,

					    u16 initiator, u16 reason,

					    bool from_timer)

{

	struct ieee80211_local *local = sta->local;

	struct tid_ampdu_rx *tid_rx;
@@ -69,10 +70,17 @@ void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, 


	spin_unlock_bh(&sta->lock);



	if (!from_timer)

		del_timer_sync(&tid_rx->session_timer);

	kfree(tid_rx);

}



void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,

				    u16 initiator, u16 reason)

{

	___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason, false);

}



/*

 * After accepting the AddBA Request we activated a timer,

 * resetting it after each frame that arrives from the originator.
@@ -91,8 +99,8 @@ static void sta_rx_agg_session_timer_expired(unsigned long data) 
#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "rx session timer expired on tid %d\n", (u16)*ptid);

#endif

	__ieee80211_stop_rx_ba_session(sta, *ptid, WLAN_BACK_RECIPIENT,

				       WLAN_REASON_QSTA_TIMEOUT);

	___ieee80211_stop_rx_ba_session(sta, *ptid, WLAN_BACK_RECIPIENT,

					WLAN_REASON_QSTA_TIMEOUT, true);

}



static void ieee80211_send_addba_resp(struct ieee80211_sub_if_data *sdata, u8 *da, u16 tid,