summaryrefslogtreecommitdiffstats
path: root/net/mac80211/status.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-10-04 18:27:10 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 16:41:08 -0400
commit28a1bcdb57d50f3038a255741ecc83e391e5282e (patch)
treedec9177c1756343a7ba27db929e189c3726f26f9 /net/mac80211/status.c
parentaf4dc88c56559c1ebf53628ddcc18dde23924e33 (diff)
downloadop-kernel-dev-28a1bcdb57d50f3038a255741ecc83e391e5282e.zip
op-kernel-dev-28a1bcdb57d50f3038a255741ecc83e391e5282e.tar.gz
mac80211: fix offchannel TX cookie matching
When I introduced in-kernel off-channel TX I introduced a bug -- the work can't be canceled again because the code clear the skb pointer. Fix this by keeping track separately of whether TX status has already been reported. Cc: stable@kernel.org [2.6.38+] Reported-by: Jouni Malinen <j@w1.fi> Tested-by: Jouni Malinen <j@w1.fi> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/status.c')
-rw-r--r--net/mac80211/status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 864a9c3..f3d7107 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -429,7 +429,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
continue;
if (wk->offchan_tx.frame != skb)
continue;
- wk->offchan_tx.frame = NULL;
+ wk->offchan_tx.status = true;
break;
}
rcu_read_unlock();
OpenPOWER on IntegriCloud