aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211.c
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.c
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.c')
-rw-r--r--net/mac80211/ieee80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 804da5e89bbf..f484ca7ade9c 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -254,7 +254,7 @@ static int ieee80211_open(struct net_device *dev)
254 ieee80211_enable_keys(sdata); 254 ieee80211_enable_keys(sdata);
255 255
256 if (sdata->type == IEEE80211_IF_TYPE_STA && 256 if (sdata->type == IEEE80211_IF_TYPE_STA &&
257 !local->user_space_mlme) 257 !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME))
258 netif_carrier_off(dev); 258 netif_carrier_off(dev);
259 else 259 else
260 netif_carrier_on(dev); 260 netif_carrier_on(dev);