mac80211: remove drop_unencrypted code
authorJohannes Berg <johannes.berg@intel.com>
Fri, 20 Mar 2015 10:37:36 +0000 (11:37 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 20 Mar 2015 10:37:36 +0000 (11:37 +0100)
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>
net/mac80211/debugfs.c
net/mac80211/debugfs_netdev.c
net/mac80211/ibss.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/mac80211/rx.c
net/mac80211/tx.c

index 74830ce25e74d0fe6563fb6e065521170eb7632b..23813ebb349cd67c3f3248da90312695657e686f 100644 (file)
@@ -274,8 +274,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
        DEBUGFS_STATS_ADD(tx_handlers_drop, local->tx_handlers_drop);
        DEBUGFS_STATS_ADD(tx_handlers_queued, local->tx_handlers_queued);
-       DEBUGFS_STATS_ADD(tx_handlers_drop_unencrypted,
-               local->tx_handlers_drop_unencrypted);
        DEBUGFS_STATS_ADD(tx_handlers_drop_fragment,
                local->tx_handlers_drop_fragment);
        DEBUGFS_STATS_ADD(tx_handlers_drop_wep,
index c68896adfa960113c584656c478fd8ff043a11ca..29236e832e44470a4f13637847c2d1cbafb9bfb2 100644 (file)
@@ -177,7 +177,6 @@ static ssize_t ieee80211_if_write_##name(struct file *file,         \
        IEEE80211_IF_FILE_R(name)
 
 /* common attributes */
-IEEE80211_IF_FILE(drop_unencrypted, drop_unencrypted, DEC);
 IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[IEEE80211_BAND_2GHZ],
                  HEX);
 IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[IEEE80211_BAND_5GHZ],
@@ -562,7 +561,6 @@ IEEE80211_IF_FILE(dot11MeshAwakeWindowDuration,
 
 static void add_common_files(struct ieee80211_sub_if_data *sdata)
 {
-       DEBUGFS_ADD(drop_unencrypted);
        DEBUGFS_ADD(rc_rateidx_mask_2ghz);
        DEBUGFS_ADD(rc_rateidx_mask_5ghz);
        DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);
index dec24d436e739166ac1bc7223edf80d7d495043a..17eda3575d7d926fabae7832c33ae7fd47fe98ab 100644 (file)
@@ -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,
index 0266c573c36619c72f5e27b757204f11dbf5bb12..4f4bcc6c5dfe4877f70b8c26a6f8ad146f95da92 100644 (file)
@@ -818,8 +818,6 @@ struct ieee80211_sub_if_data {
 
        unsigned long state;
 
-       int drop_unencrypted;
-
        char name[IFNAMSIZ];
 
        /* Fragment table for host-based reassembly */
@@ -1262,7 +1260,6 @@ struct ieee80211_local {
        /* TX/RX handler statistics */
        unsigned int tx_handlers_drop;
        unsigned int tx_handlers_queued;
-       unsigned int tx_handlers_drop_unencrypted;
        unsigned int tx_handlers_drop_fragment;
        unsigned int tx_handlers_drop_wep;
        unsigned int tx_handlers_drop_not_assoc;
index 81a27516813e2f3473bec783ef9253b54967e62d..9689d3b1133b48c3827838fc9fd966c09aa8fa0b 100644 (file)
@@ -1508,7 +1508,6 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
        }
 
        /* reset some values that shouldn't be kept across type changes */
-       sdata->drop_unencrypted = 0;
        if (type == NL80211_IFTYPE_STATION)
                sdata->u.mgd.use_4addr = false;
 
index 6accd61ee54b2b0f9a58f9828d8c00e98d33e236..9eab44317c871690d98899e9e90766fbc8798e85 100644 (file)
@@ -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;
index 7e7de811e6ad3190a05e6f75f8bc89af66b66033..0bae03bca49e5fcda29148b5e583c77cf9758396 100644 (file)
@@ -593,23 +593,8 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx)
        else if (!is_multicast_ether_addr(hdr->addr1) &&
                 (key = rcu_dereference(tx->sdata->default_unicast_key)))
                tx->key = key;
-       else if (info->flags & IEEE80211_TX_CTL_INJECTED)
-               tx->key = NULL;
-       else if (!tx->sdata->drop_unencrypted)
-               tx->key = NULL;
-       else if (tx->skb->protocol == tx->sdata->control_port_protocol)
-               tx->key = NULL;
-       else if (ieee80211_is_robust_mgmt_frame(tx->skb) &&
-                !(ieee80211_is_action(hdr->frame_control) &&
-                  tx->sta && test_sta_flag(tx->sta, WLAN_STA_MFP)))
-               tx->key = NULL;
-       else if (ieee80211_is_mgmt(hdr->frame_control) &&
-                !ieee80211_is_robust_mgmt_frame(tx->skb))
+       else
                tx->key = NULL;
-       else {
-               I802_DEBUG_INC(tx->local->tx_handlers_drop_unencrypted);
-               return TX_DROP;
-       }
 
        if (tx->key) {
                bool skip_hw = false;