git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
net
/
mac80211
/
agg-tx.c
diff --git
a/net/mac80211/agg-tx.c
b/net/mac80211/agg-tx.c
index
c893f23
..
8f23401
100644
(file)
--- 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,