---

yaml --- r: 183571 b: refs/heads/master c: 3dc1de0 h: refs/heads/master i: 183569: 99e4a72 183567: 704dba2 v: v3
git-mirror · Jan 12, 2010 · 958b0a5 · 958b0a5
1 parent 8046c5c
commit 958b0a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e08d228b6d8e93d7b25b3573c6da7da179c2ae1
+refs/heads/master: 3dc1de0bf23816ed557ac8addf680cd5ee57e805
diff --git a/trunk/net/mac80211/agg-tx.c b/trunk/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 */
 	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;