From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Nov 2011 02:00:32 +0000 (+1100)
Subject: Merge remote-tracking branch 'wireless-next/master'
X-Git-Tag: next-20111130~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4f7421f6d825bcbf2de3ddcbabc6a727a15ca8e9;p=karo-tx-linux.git

Merge remote-tracking branch 'wireless-next/master'
---

4f7421f6d825bcbf2de3ddcbabc6a727a15ca8e9
diff --cc net/mac80211/agg-tx.c
index 556765749b9c,266cc871c72d..2c2e9519a2e7
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -185,7 -177,10 +185,8 @@@ int ___ieee80211_stop_tx_ba_session(str
  	       sta->sta.addr, tid);
  #endif /* CONFIG_MAC80211_HT_DEBUG */
  
 -	set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);
 -
  	del_timer_sync(&tid_tx->addba_resp_timer);
+ 	del_timer_sync(&tid_tx->session_timer);
  
  	/*
  	 * After this packets are no longer handed right through