diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-26 17:53:20 +0200 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-11 01:54:19 +0200 |
commit | ddd3d2be85e3207c47f2b3c431723e6c758b4b0d (patch) | |
tree | 126bb0b470f94e82d4a7f7c0c88bac0b35c95623 /net/mac80211/ieee80211.c | |
parent | [MAC80211]: improve radiotap injection (diff) | |
download | linux-ddd3d2be85e3207c47f2b3c431723e6c758b4b0d.tar.xz linux-ddd3d2be85e3207c47f2b3c431723e6c758b4b0d.zip |
[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.c | 2 |
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) ieee80211_enable_keys(sdata); if (sdata->type == IEEE80211_IF_TYPE_STA && - !local->user_space_mlme) + !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)) netif_carrier_off(dev); else netif_carrier_on(dev); |