diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-10-04 12:27:10 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-11 16:41:08 -0400 |
commit | 28a1bcdb57d50f3038a255741ecc83e391e5282e (patch) | |
tree | dec9177c1756343a7ba27db929e189c3726f26f9 /net/mac80211/ieee80211_i.h | |
parent | af4dc88c56559c1ebf53628ddcc18dde23924e33 (diff) |
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/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 9fa5f8a674bc..810d7b6a5567 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -346,6 +346,7 @@ struct ieee80211_work { | |||
346 | struct { | 346 | struct { |
347 | struct sk_buff *frame; | 347 | struct sk_buff *frame; |
348 | u32 wait; | 348 | u32 wait; |
349 | bool status; | ||
349 | } offchan_tx; | 350 | } offchan_tx; |
350 | }; | 351 | }; |
351 | 352 | ||