summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-03-20 11:37:36 +0100
committerJohannes Berg <johannes.berg@intel.com>2015-03-20 11:37:36 +0100
commite8f4fb7c7c6b25dc0495f1fd43b03444f0a5c6e3 (patch)
tree98bd6b2bd1957a8a35ed4bd9a82db3e307e3d7de /net/mac80211/rx.c
parentc7ef38e0ccca25050efed56a35df2e1e93c0b469 (diff)
downloadblackbird-op-linux-e8f4fb7c7c6b25dc0495f1fd43b03444f0a5c6e3.tar.gz
blackbird-op-linux-e8f4fb7c7c6b25dc0495f1fd43b03444f0a5c6e3.zip
mac80211: remove drop_unencrypted code
This mechanism was historic, and only ever used by IBSS, which also doesn't need to have it as it properly manages station's 802.1X PAE state (or, with WEP, always has a key.) Remove the mechanism to clean up the code. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 6accd61ee54b..9eab44317c87 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1912,8 +1912,7 @@ static int ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc)
/* Drop unencrypted frames if key is set. */
if (unlikely(!ieee80211_has_protected(fc) &&
!ieee80211_is_nullfunc(fc) &&
- ieee80211_is_data(fc) &&
- (rx->key || rx->sdata->drop_unencrypted)))
+ ieee80211_is_data(fc) && rx->key))
return -EACCES;
return 0;
OpenPOWER on IntegriCloud