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>
This commit is contained in:

committed by
John W. Linville

parent
ac7f9cfa2c
commit
7986cf9581
@@ -1877,18 +1877,13 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_data *rx)
|
||||
if (ieee80211_vif_is_mesh(&sdata->vif))
|
||||
return ieee80211_mesh_rx_mgmt(sdata, rx->skb, rx->status);
|
||||
|
||||
if (sdata->vif.type != NL80211_IFTYPE_STATION &&
|
||||
sdata->vif.type != NL80211_IFTYPE_ADHOC)
|
||||
return RX_DROP_MONITOR;
|
||||
if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
|
||||
return ieee80211_ibss_rx_mgmt(sdata, rx->skb, rx->status);
|
||||
|
||||
|
||||
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
|
||||
if (sdata->flags & IEEE80211_SDATA_USERSPACE_MLME)
|
||||
return RX_DROP_MONITOR;
|
||||
if (sdata->vif.type == NL80211_IFTYPE_STATION)
|
||||
return ieee80211_sta_rx_mgmt(sdata, rx->skb, rx->status);
|
||||
}
|
||||
|
||||
return ieee80211_ibss_rx_mgmt(sdata, rx->skb, rx->status);
|
||||
return RX_DROP_MONITOR;
|
||||
}
|
||||
|
||||
static void ieee80211_rx_michael_mic_report(struct net_device *dev,
|
||||
|
Reference in New Issue
Block a user