From: Johannes Berg Date: Mon, 19 Apr 2010 08:48:38 +0000 (+0200) Subject: mac80211: remove bogus TX agg state assignment X-Git-Tag: firefly_0821_release~10186^2~1711 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb85b86ad4989b8d3aa5cbb2aafc9568a22fd3ce;p=firefly-linux-kernel-4.4.55.git mac80211: remove bogus TX agg state assignment 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 Signed-off-by: John W. Linville Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 9144ef0f5dd5..2e08921b7cf6 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -181,7 +181,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",