diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-02-08 12:03:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 12:03:54 -0800 |
| commit | e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (patch) | |
| tree | a0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4 /net/mac80211/cfg.c | |
| parent | Merge branch 'batman-adv/merge' of git://git.open-mesh.org/ecsv/linux-merge (diff) | |
| parent | mac80211: fix the skb cloned check in the tx path (diff) | |
| download | linux-dev-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.tar.xz linux-dev-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 4bc8a9250cfd..9cd73b11506e 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1822,6 +1822,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev, *cookie ^= 2; IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_TX_OFFCHAN; local->hw_roc_skb = skb; + local->hw_roc_skb_for_status = skb; mutex_unlock(&local->mtx); return 0; @@ -1875,6 +1876,7 @@ static int ieee80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, if (ret == 0) { kfree_skb(local->hw_roc_skb); local->hw_roc_skb = NULL; + local->hw_roc_skb_for_status = NULL; } mutex_unlock(&local->mtx); |