summaryrefslogtreecommitdiffstats
path: root/net/wireless/sme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2023-01-16 15:24:11 +0100
committerJohannes Berg <johannes.berg@intel.com>2023-01-18 17:31:44 +0100
commit585b6e1304dcc46e65dc1aaca5973b33abd0c48d (patch)
tree1f8a9c854f581f2e9eebc95449921308cd622756 /net/wireless/sme.c
parentMerge wireless into wireless-next (diff)
downloadlinux-585b6e1304dcc46e65dc1aaca5973b33abd0c48d.tar.xz
linux-585b6e1304dcc46e65dc1aaca5973b33abd0c48d.zip
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>
Diffstat (limited to 'net/wireless/sme.c')
-rw-r--r--net/wireless/sme.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 4b5b6ee0fe01..123248b2c0be 100644
--- 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;