aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-26 11:53:20 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:54:19 -0400
commitddd3d2be85e3207c47f2b3c431723e6c758b4b0d (patch)
tree126bb0b470f94e82d4a7f7c0c88bac0b35c95623 /net/mac80211/ieee80211_i.h
parent58d4185e36913d4fc94afa4b4daccb3c9aa01957 (diff)
[MAC80211]: make userspace-mlme a per-interface setting
Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 0fe077747082..db80e1be1dcb 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -287,6 +287,7 @@ struct ieee80211_if_sta {
287 * generator reports that there are no present stations that cannot support short 287 * generator reports that there are no present stations that cannot support short
288 * preambles */ 288 * preambles */
289#define IEEE80211_SDATA_SHORT_PREAMBLE BIT(3) 289#define IEEE80211_SDATA_SHORT_PREAMBLE BIT(3)
290#define IEEE80211_SDATA_USERSPACE_MLME BIT(4)
290struct ieee80211_sub_if_data { 291struct ieee80211_sub_if_data {
291 struct list_head list; 292 struct list_head list;
292 enum ieee80211_if_types type; 293 enum ieee80211_if_types type;
@@ -553,8 +554,6 @@ struct ieee80211_local {
553 unsigned int hw_modes; /* bitfield of supported hardware modes; 554 unsigned int hw_modes; /* bitfield of supported hardware modes;
554 * (1 << MODE_*) */ 555 * (1 << MODE_*) */
555 556
556 int user_space_mlme;
557
558#ifdef CONFIG_MAC80211_DEBUGFS 557#ifdef CONFIG_MAC80211_DEBUGFS
559 struct local_debugfsdentries { 558 struct local_debugfsdentries {
560 struct dentry *channel; 559 struct dentry *channel;