aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-03-21 12:08:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-03-27 20:13:08 -0400
commit7986cf9581767d250ca0e5a554541bb276e08d21 (patch)
treeeae47d0486f35c49605dd6c96603c13b1390343b /net/mac80211/mlme.c
parentac7f9cfa2c3b810e0adfb889ad407a8c79a84dbe (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/mlme.c')
-rw-r--r--net/mac80211/mlme.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b0808efcedf6..c05be09b9c6f 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -849,8 +849,7 @@ static int ieee80211_privacy_mismatch(struct ieee80211_sub_if_data *sdata)
849 int wep_privacy; 849 int wep_privacy;
850 int privacy_invoked; 850 int privacy_invoked;
851 851
852 if (!ifmgd || (ifmgd->flags & (IEEE80211_STA_MIXED_CELL | 852 if (!ifmgd || (ifmgd->flags & IEEE80211_STA_EXT_SME))
853 IEEE80211_STA_EXT_SME)))
854 return 0; 853 return 0;
855 854
856 bss = ieee80211_rx_bss_get(local, ifmgd->bssid, 855 bss = ieee80211_rx_bss_get(local, ifmgd->bssid,