diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-10-04 18:27:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:35:51 -0800 |
| commit | 4641f8a010eb97303fbc9bd8a094139b52ffd629 (patch) | |
| tree | faf12450d0c295795f7f70464c9ae018f2c50f9e /net/mac80211/cfg.c | |
| parent | 806aeb924e925e6f1584ff956c9b9695e4ec18f9 (diff) | |
| download | kernel_samsung_smdk4412-4641f8a010eb97303fbc9bd8a094139b52ffd629.zip kernel_samsung_smdk4412-4641f8a010eb97303fbc9bd8a094139b52ffd629.tar.gz kernel_samsung_smdk4412-4641f8a010eb97303fbc9bd8a094139b52ffd629.tar.bz2 | |
mac80211: fix offchannel TX cookie matching
commit 28a1bcdb57d50f3038a255741ecc83e391e5282e upstream.
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.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index be70c70..143a006 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1798,7 +1798,7 @@ ieee80211_offchan_tx_done(struct ieee80211_work *wk, struct sk_buff *skb) * so in that case userspace will have to deal with it. */ - if (wk->offchan_tx.wait && wk->offchan_tx.frame) + if (wk->offchan_tx.wait && !wk->offchan_tx.status) cfg80211_mgmt_tx_status(wk->sdata->dev, (unsigned long) wk->offchan_tx.frame, wk->ie, wk->ie_len, false, GFP_KERNEL); |