diff options
| author | Johannes Berg | 2009-03-21 17:08:43 +0100 |
|---|---|---|
| committer | John W. Linville | 2009-03-27 20:13:08 -0400 |
| commit | 7986cf9581767d250ca0e5a554541bb276e08d21 (patch) | |
| tree | eae47d0486f35c49605dd6c96603c13b1390343b /net/mac80211/iface.c | |
| parent | ac7f9cfa2c3b810e0adfb889ad407a8c79a84dbe (diff) | |
mac80211: remove mixed-cell and userspace MLME code
Neither can currently be set from userspace, so there's no
regression potential, and neither will be supported from
userspace since the new userspace APIs allow the SME, which
is in userspace, to control all we need.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 34f4798a98f7..dd2a276fa8ca 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -261,8 +261,7 @@ static int ieee80211_open(struct net_device *dev) ieee80211_bss_info_change_notify(sdata, changed); ieee80211_enable_keys(sdata); - if (sdata->vif.type == NL80211_IFTYPE_STATION && - !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)) + if (sdata->vif.type == NL80211_IFTYPE_STATION) netif_carrier_off(dev); else netif_carrier_on(dev); |