aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.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/rx.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/rx.c')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 8c16574ec39c..4c046af237e3 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1199,7 +1199,7 @@ ieee80211_rx_h_mgmt(struct ieee80211_txrx_data *rx)
1199 sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev); 1199 sdata = IEEE80211_DEV_TO_SUB_IF(rx->dev);
1200 if ((sdata->type == IEEE80211_IF_TYPE_STA || 1200 if ((sdata->type == IEEE80211_IF_TYPE_STA ||
1201 sdata->type == IEEE80211_IF_TYPE_IBSS) && 1201 sdata->type == IEEE80211_IF_TYPE_IBSS) &&
1202 !rx->local->user_space_mlme) 1202 !(sdata->flags & IEEE80211_SDATA_USERSPACE_MLME))
1203 ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status); 1203 ieee80211_sta_rx_mgmt(rx->dev, rx->skb, rx->u.rx.status);
1204 else 1204 else
1205 return TXRX_DROP; 1205 return TXRX_DROP;