Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4bb5c3f authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f2fa1b01

net/mac80211/agg-tx.c

+0 −1
Original line number Diff line number Diff line
@@ -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",