| From b4bb5c3fd9333024044362df67e23e96158489ed Mon Sep 17 00:00:00 2001 |
| From: Johannes Berg <johannes@sipsolutions.net> |
| Date: Mon, 19 Apr 2010 10:48:38 +0200 |
| Subject: mac80211: remove bogus TX agg state assignment |
| |
| From: Johannes Berg <johannes@sipsolutions.net> |
| |
| commit b4bb5c3fd9333024044362df67e23e96158489ed upstream. |
| |
| 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. |
| |
| Signed-off-by: Johannes Berg <johannes@sipsolutions.net> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/mac80211/agg-tx.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/net/mac80211/agg-tx.c |
| +++ b/net/mac80211/agg-tx.c |
| @@ -183,7 +183,6 @@ static void sta_addba_resp_timer_expired |
| 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", |