diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-09 02:19:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-09 02:19:01 +0100 |
| commit | 263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea (patch) | |
| tree | 5ee497d530185d32421122729af86cf77d0dc649 /net/mac80211/ieee80211_i.h | |
| parent | net: Kill NETEVENT_PMTU_UPDATE. (diff) | |
| parent | pch_can: fix module reload issue with MSI (diff) | |
| download | linux-263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea.tar.xz linux-263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/netdev.c
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 44eea1af1553..f2ef15d910a5 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -951,7 +951,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; |