summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-10-06 16:25:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-10-06 16:25:52 -0400
commit373426cac0cbb7f762018127803dcd70838e2cdf (patch)
tree701322d66576c343051db9c091eb3805d340cdc3 /net
parent46bf695802bb090d9d0d0fec6bb5b46c24b17d4e (diff)
parent44271488b91c9eecf249e075a1805dd887e222d2 (diff)
downloadop-kernel-dev-373426cac0cbb7f762018127803dcd70838e2cdf.zip
op-kernel-dev-373426cac0cbb7f762018127803dcd70838e2cdf.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/agg-tx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index c893f23..8f23401 100644
--- a/net/mac80211/agg-tx.c
+++ b/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,
OpenPOWER on IntegriCloud