aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorMichael Wu <flamingice@sourmilk.net>2008-01-31 13:48:23 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:02 -0500
commit8cc9a73914b07b5908d8a59320f4557fc9639f2e (patch)
tree34ad48b7fa4078c04bd83a45e7cef75b0f49176a /net/mac80211/ieee80211_i.h
parent66f7ac50ed7cc5c19a62bc97e8f6e7891004a03a (diff)
mac80211: Use monitor configuration flags
Take advantage of the monitor configuration flags now provided by cfg80211. Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 31fc64c5652c..21d54b27ccc1 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -345,6 +345,7 @@ struct ieee80211_sub_if_data {
345 struct ieee80211_if_wds wds; 345 struct ieee80211_if_wds wds;
346 struct ieee80211_if_vlan vlan; 346 struct ieee80211_if_vlan vlan;
347 struct ieee80211_if_sta sta; 347 struct ieee80211_if_sta sta;
348 u32 mntr_flags;
348 } u; 349 } u;
349 int channel_use; 350 int channel_use;
350 int channel_use_raw; 351 int channel_use_raw;
@@ -425,6 +426,8 @@ struct ieee80211_local {
425 struct net_device *mdev; /* wmaster# - "master" 802.11 device */ 426 struct net_device *mdev; /* wmaster# - "master" 802.11 device */
426 int open_count; 427 int open_count;
427 int monitors; 428 int monitors;
429 /* number of interfaces with corresponding FIF_ flags */
430 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss;
428 unsigned int filter_flags; /* FIF_* */ 431 unsigned int filter_flags; /* FIF_* */
429 struct iw_statistics wstats; 432 struct iw_statistics wstats;
430 u8 wstats_flags; 433 u8 wstats_flags;