Skip to contentSkip to conversation

mac80211: quit addba_resp_timer if Tx BA session is torn down

PATCH In review Zhu Yi 2 participants 2 messages Dec 28, 2009 mac80211

lore
Share & tools
lore

Zhu Yi

author
#0 lore raw

PATCH v2 1/1 mac80211: quit addba_resp_timer if Tx BA session is torn down

Make addba_resp_timer aware the HT_AGG_STATE_REQ_STOP_BA_MSK mask so that when ___ieee80211_stop_tx_ba_session() is issued the timer will quit. Otherwise when suspend happens before the timer expired, the timer handler will be called immediately after resume and messes up driver status.

Cc Johannes Berg <[email protected]>
---
 net/mac80211/agg-tx.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
net/mac80211/agg-tx.c +2 -1
index ceda366..a57bd73 100644
@@ -179,7 +179,8 @@ static void sta_addba_resp_timer_expired(unsigned long data)
 
 	/* check if the TID waits for addBA response */
 	spin_lock_bh(&sta->lock);
-	if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK)) !=
+	if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK |
+		       HT_AGG_STATE_REQ_STOP_BA_MSK)) !=
 						HT_ADDBA_REQUESTED_MSK) {
 		spin_unlock_bh(&sta->lock);
 		*state = HT_AGG_STATE_IDLE;
Signature · 1 line
1.6.3.3
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 5 lines · Zhu Yi

Make addba_resp_timer aware the HT_AGG_STATE_REQ_STOP_BA_MSK mask so that when ___ieee80211_stop_tx_ba_session() is issued the timer will quit. Otherwise when suspend happens before the timer expired, the timer handler will be called immediately after resume and messes up driver status.

Want to reference the bug report still?

In any case

Quoted 21 lines
Cc Johannes Berg <[email protected]>
---
 net/mac80211/agg-tx.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
net/mac80211/agg-tx.c +2 -1
index ceda366..a57bd73 100644
@@ -179,7 +179,8 @@ static void sta_addba_resp_timer_expired(unsigned
 long data)
 
 	/* check if the TID waits for addBA response */
 	spin_lock_bh(&sta->lock);
-	if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK)) !=
+	if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK |
+		       HT_AGG_STATE_REQ_STOP_BA_MSK)) !=
 						HT_ADDBA_REQUESTED_MSK) {
 		spin_unlock_bh(&sta->lock);

*state = HT_AGG_STATE_IDLE;