--- net/mac80211/agg-tx.c

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

@@ -177,10 +177,10 @@ static void sta_addba_resp_timer_expired

/* 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;

#ifdef CONFIG_MAC80211_HT_DEBUG

printk(KERN_DEBUG "timer expired on tid %d but we are not "

"(or no longer) expecting addBA response there",