diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2010-04-19 10:48:38 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-19 16:34:11 -0400 |
| commit | b4bb5c3fd9333024044362df67e23e96158489ed (patch) | |
| tree | 180405311d50e63ac6f6dd67eefefeb2c2c110bc /net | |
| parent | f2fa1b015e9c199e45c836c769d94db595150731 (diff) | |
| download | lwn-b4bb5c3fd9333024044362df67e23e96158489ed.tar.gz lwn-b4bb5c3fd9333024044362df67e23e96158489ed.zip | |
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.c | 1 |
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) 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", |