summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.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/ibss.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/ibss.c')
-rw-r--r--net/mac80211/ibss.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index dec24d436e73..17eda3575d7d 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -249,8 +249,6 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
if (presp)
kfree_rcu(presp, rcu_head);
- sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
-
/* make a copy of the chandef, it could be modified below. */
chandef = *req_chandef;
chan = chandef.chan;
@@ -1303,8 +1301,6 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
if (ifibss->privacy)
capability |= WLAN_CAPABILITY_PRIVACY;
- else
- sdata->drop_unencrypted = 0;
__ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
&ifibss->chandef, ifibss->basic_rates,
OpenPOWER on IntegriCloud