[patch 009/123] mac80211: quit addba_resp_timer if Tx BA session is torn down
in [Kernel]
|
Prev: [patch 017/123] drm/i915: give up on 8xx lid status
Next: [patch 016/123] x86, uv: uv_global_gru_mmr_address() macro fix
From: Greg KH on 12 Mar 2010 20:40 2.6.33-stable review patch. If anyone has any objections, please let me know. ----------------- From: Zhu Yi <yi.zhu(a)intel.com> commit 3dc1de0bf23816ed557ac8addf680cd5ee57e805 upstream. Make addba_resp_timer aware the HT_AGG_STATE_REQ_STOP_BA_MSK mask so that when ___ieee80211_stop_tx_ba_session() is issued the timer will quit. Otherwise when suspend happens before the timer expired, the timer handler will be called immediately after resume and messes up driver status. Signed-off-by: Zhu Yi <yi.zhu(a)intel.com> Acked-by: Johannes Berg <johannes(a)sipsolutions.net> Signed-off-by: John W. Linville <linville(a)tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- net/mac80211/agg-tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -179,7 +179,8 @@ static void sta_addba_resp_timer_expired /* check if the TID waits for addBA response */ spin_lock_bh(&sta->lock); - if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK)) != + if ((*state & (HT_ADDBA_REQUESTED_MSK | HT_ADDBA_RECEIVED_MSK | + HT_AGG_STATE_REQ_STOP_BA_MSK)) != HT_ADDBA_REQUESTED_MSK) { spin_unlock_bh(&sta->lock); *state = HT_AGG_STATE_IDLE; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |