diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 21:03:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 21:03:54 +0100 |
| commit | e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (patch) | |
| tree | a0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4 /net/mac80211/ieee80211_i.h | |
| 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-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.tar.xz linux-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c47d7c0e48a4..533fd32f49ff 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -953,7 +953,7 @@ struct ieee80211_local { struct ieee80211_channel *hw_roc_channel; struct net_device *hw_roc_dev; - struct sk_buff *hw_roc_skb; + struct sk_buff *hw_roc_skb, *hw_roc_skb_for_status; struct work_struct hw_roc_start, hw_roc_done; enum nl80211_channel_type hw_roc_channel_type; unsigned int hw_roc_duration; |