aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorMichael Wu <flamingice@sourmilk.net>2008-01-31 13:48:27 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-02-29 15:37:03 -0500
commit3d30d949cf3f9763393f3457721bca3ac2426e42 (patch)
treed80d1490f8a5263d74b4ed105835a7ef21eb6b80 /net/mac80211/ieee80211_i.h
parent8944b79fe9b1fe249c599e7e51f1bfad539aab6d (diff)
mac80211: Add cooked monitor mode support
This adds "cooked" monitor mode to mac80211. A monitor interface in "cooked" mode will see all frames that mac80211 has not used internally. 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, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 1129a4299de7..1b4a4497030d 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -131,6 +131,7 @@ typedef unsigned __bitwise__ ieee80211_rx_result;
131#define IEEE80211_TXRXD_RXRA_MATCH BIT(5) 131#define IEEE80211_TXRXD_RXRA_MATCH BIT(5)
132#define IEEE80211_TXRXD_TX_INJECTED BIT(6) 132#define IEEE80211_TXRXD_TX_INJECTED BIT(6)
133#define IEEE80211_TXRXD_RX_AMSDU BIT(7) 133#define IEEE80211_TXRXD_RX_AMSDU BIT(7)
134#define IEEE80211_TXRXD_RX_CMNTR_REPORTED BIT(8)
134struct ieee80211_txrx_data { 135struct ieee80211_txrx_data {
135 struct sk_buff *skb; 136 struct sk_buff *skb;
136 struct net_device *dev; 137 struct net_device *dev;
@@ -419,7 +420,7 @@ struct ieee80211_local {
419 420
420 struct net_device *mdev; /* wmaster# - "master" 802.11 device */ 421 struct net_device *mdev; /* wmaster# - "master" 802.11 device */
421 int open_count; 422 int open_count;
422 int monitors; 423 int monitors, cooked_mntrs;
423 /* number of interfaces with corresponding FIF_ flags */ 424 /* number of interfaces with corresponding FIF_ flags */
424 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss; 425 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss;
425 unsigned int filter_flags; /* FIF_* */ 426 unsigned int filter_flags; /* FIF_* */