wifi: cfg80211: remove support for static WEP

This reverts commit b8676221f00d ("cfg80211: Add support for
static WEP in the driver") since no driver ever ended up using
it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 03d4f4d..1f8f827 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1075,7 +1075,6 @@ struct survey_info {
        s8 noise;
 };
 
-#define CFG80211_MAX_WEP_KEYS  4
 #define CFG80211_MAX_NUM_AKM_SUITES    10
 
 /**
@@ -1099,9 +1098,6 @@ struct survey_info {
  *     port frames over NL80211 instead of the network interface.
  * @control_port_no_preauth: disables pre-auth rx over the nl80211 control
  *     port for mac80211
- * @wep_keys: static WEP keys, if not NULL points to an array of
- *     CFG80211_MAX_WEP_KEYS WEP keys
- * @wep_tx_key: key index (0..3) of the default TX static WEP key
  * @psk: PSK (for devices supporting 4-way-handshake offload)
  * @sae_pwd: password for SAE authentication (for devices supporting SAE
  *     offload)
@@ -1134,8 +1130,6 @@ struct cfg80211_crypto_settings {
        bool control_port_no_encrypt;
        bool control_port_over_nl80211;
        bool control_port_no_preauth;
-       struct key_params *wep_keys;
-       int wep_tx_key;
        const u8 *psk;
        const u8 *sae_pwd;
        u8 sae_pwd_len;
@@ -4683,8 +4677,6 @@ struct cfg80211_ops {
  * @WIPHY_FLAG_SUPPORTS_5_10_MHZ: Device supports 5 MHz and 10 MHz channels.
  * @WIPHY_FLAG_HAS_CHANNEL_SWITCH: Device supports channel switch in
  *     beaconing mode (AP, IBSS, Mesh, ...).
- * @WIPHY_FLAG_HAS_STATIC_WEP: The device supports static WEP key installation
- *     before connection.
  * @WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK: The device supports bigger kek and kck keys
  * @WIPHY_FLAG_SUPPORTS_MLO: This is a temporary flag gating the MLO APIs,
  *     in order to not have them reachable in normal drivers, until we have
@@ -4715,7 +4707,6 @@ enum wiphy_flags {
        WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL        = BIT(21),
        WIPHY_FLAG_SUPPORTS_5_10_MHZ            = BIT(22),
        WIPHY_FLAG_HAS_CHANNEL_SWITCH           = BIT(23),
-       WIPHY_FLAG_HAS_STATIC_WEP               = BIT(24),
 };
 
 /**

diff --git a/net/wireless/core.h b/net/wireless/core.h
index af85d89..7c61752 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -278,8 +278,8 @@ struct cfg80211_event {
 };
 
 struct cfg80211_cached_keys {
-       struct key_params params[CFG80211_MAX_WEP_KEYS];
-       u8 data[CFG80211_MAX_WEP_KEYS][WLAN_KEY_LEN_WEP104];
+       struct key_params params[4];
+       u8 data[4][WLAN_KEY_LEN_WEP104];
        int def;
 };
 

diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index edd062f..e6fdb0b 100644 (file)
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -45,8 +45,7 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
        cfg80211_hold_bss(bss_from_pub(bss));
        wdev->u.ibss.current_bss = bss_from_pub(bss);
 
-       if (!(wdev->wiphy->flags & WIPHY_FLAG_HAS_STATIC_WEP))
-               cfg80211_upload_connect_keys(wdev);
+       cfg80211_upload_connect_keys(wdev);
 
        nl80211_send_ibss_bssid(wiphy_to_rdev(wdev->wiphy), dev, bssid,
                                GFP_KERNEL);
@@ -294,7 +293,7 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
                ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
                if (!ck)
                        return -ENOMEM;
-               for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
+               for (i = 0; i < 4; i++)
                        ck->params[i].key = ck->data[i];
        }
        err = __cfg80211_join_ibss(rdev, wdev->netdev,

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 4b5b6ee..123248b 100644 (file)
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -855,8 +855,7 @@ void __cfg80211_connect_result(struct net_device *dev,
                               ETH_ALEN);
        }
 
-       if (!(wdev->wiphy->flags & WIPHY_FLAG_HAS_STATIC_WEP))
-               cfg80211_upload_connect_keys(wdev);
+       cfg80211_upload_connect_keys(wdev);
 
        rcu_read_lock();
        for_each_valid_link(cr, link) {
@@ -1462,9 +1461,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
                                connect->crypto.ciphers_pairwise[0] = cipher;
                        }
                }
-
-               connect->crypto.wep_keys = connkeys->params;
-               connect->crypto.wep_tx_key = connkeys->def;
        } else {
                if (WARN_ON(connkeys))
                        return -EINVAL;

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 8f403f9..38d3b43 100644 (file)
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -934,7 +934,7 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)
        if (!wdev->connect_keys)
                return;
 
-       for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++) {
+       for (i = 0; i < 4; i++) {
                if (!wdev->connect_keys->params[i].cipher)
                        continue;
                if (rdev_add_key(rdev, dev, -1, i, false, NULL,

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 8a24dfc..e3acfac 100644 (file)
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -439,7 +439,7 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
                                          GFP_KERNEL);
                if (!wdev->wext.keys)
                        return -ENOMEM;
-               for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
+               for (i = 0; i < 4; i++)
                        wdev->wext.keys->params[i].key =
                                wdev->wext.keys->data[i];
        }

diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 191c6d9..f231207 100644 (file)
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -47,7 +47,7 @@ int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev,
                ck = kmemdup(wdev->wext.keys, sizeof(*ck), GFP_KERNEL);
                if (!ck)
                        return -ENOMEM;
-               for (i = 0; i < CFG80211_MAX_WEP_KEYS; i++)
+               for (i = 0; i < 4; i++)
                        ck->params[i].key = ck->data[i];
        }