---

yaml --- r: 211426 b: refs/heads/master c: 4427148 h: refs/heads/master v: v3
git-mirror · Oct 6, 2010 · 29d6e62 · 29d6e62
1 parent 53462e4
commit 29d6e62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 918df629d6a558ab9eb53350493f618812239a4c
+refs/heads/master: 44271488b91c9eecf249e075a1805dd887e222d2
diff --git a/trunk/net/mac80211/agg-tx.c b/trunk/net/mac80211/agg-tx.c
@@ -175,6 +175,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
 
 	set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);
 
+	del_timer_sync(&tid_tx->addba_resp_timer);
+
 	/*
 	 * After this packets are no longer handed right through
 	 * to the driver but are put onto tid_tx->pending instead,