aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-04-19 04:48:38 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-19 16:34:11 -0400
commitb4bb5c3fd9333024044362df67e23e96158489ed (patch)
tree180405311d50e63ac6f6dd67eefefeb2c2c110bc /net
parentf2fa1b015e9c199e45c836c769d94db595150731 (diff)
mac80211: remove bogus TX agg state assignment
When the addba timer expires but has no work to do, it should not affect the state machine. If it does, TX will not see the successfully established and we can also crash trying to re-establish the session. Cc: stable@kernel.org [2.6.32, 2.6.33] Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/agg-tx.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 5538e1b4a697..944a8a92207b 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -183,7 +183,6 @@ static void sta_addba_resp_timer_expired(unsigned long data)
183 HT_AGG_STATE_REQ_STOP_BA_MSK)) != 183 HT_AGG_STATE_REQ_STOP_BA_MSK)) !=
184 HT_ADDBA_REQUESTED_MSK) { 184 HT_ADDBA_REQUESTED_MSK) {
185 spin_unlock_bh(&sta->lock); 185 spin_unlock_bh(&sta->lock);
186 *state = HT_AGG_STATE_IDLE;
187#ifdef CONFIG_MAC80211_HT_DEBUG 186#ifdef CONFIG_MAC80211_HT_DEBUG
188 printk(KERN_DEBUG "timer expired on tid %d but we are not " 187 printk(KERN_DEBUG "timer expired on tid %d but we are not "
189 "(or no longer) expecting addBA response there", 188 "(or no longer) expecting addBA response there",