From 958b0a5326fed4ad4f191cce5dd3008f98814335 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Mon, 28 Dec 2009 16:57:15 +0800 Subject: [PATCH] --- yaml --- r: 183571 b: refs/heads/master c: 3dc1de0bf23816ed557ac8addf680cd5ee57e805 h: refs/heads/master i: 183569: 99e4a728c853127da6edce0d3711086b2879a4f6 183567: 704dba2a286e6bc93b4f28f69cd69f0f9dfb6bc7 v: v3 --- [refs] | 2 +- trunk/net/mac80211/agg-tx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 24d9c9342d4a..69ddc488a2fd 100644 --- 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 index 5aa8f4a3ed17..718fbcff84d2 100644 --- 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;