Ver código fonte

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.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Zhu Yi 15 anos atrás
pai
commit
3dc1de0bf2
1 arquivos alterados com 2 adições e 1 exclusões
  1. 2 1
      net/mac80211/agg-tx.c

+ 2 - 1
net/mac80211/agg-tx.c

@@ -179,7 +179,8 @@ static void sta_addba_resp_timer_expired(unsigned long data)
 
 
 	/* check if the TID waits for addBA response */
 	/* check if the TID waits for addBA response */
 	spin_lock_bh(&sta->lock);
 	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) {
 						HT_ADDBA_REQUESTED_MSK) {
 		spin_unlock_bh(&sta->lock);
 		spin_unlock_bh(&sta->lock);
 		*state = HT_AGG_STATE_IDLE;
 		*state = HT_AGG_STATE_IDLE;