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@xxxxxxxxxx [2.6.32, 2.6.33] Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> --- net/mac80211/agg-tx.c | 1 - 1 file changed, 1 deletion(-) --- wireless-testing.orig/net/mac80211/agg-tx.c 2010-04-19 10:42:55.000000000 +0200 +++ wireless-testing/net/mac80211/agg-tx.c 2010-04-19 10:43:12.000000000 +0200 @@ -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", -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html