diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-01-16 15:24:11 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2023-01-18 17:31:44 +0100 |
| commit | 585b6e1304dcc46e65dc1aaca5973b33abd0c48d (patch) | |
| tree | 1f8a9c854f581f2e9eebc95449921308cd622756 /net/wireless/ibss.c | |
| parent | Merge wireless into wireless-next (diff) | |
| download | linux-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/ibss.c')
| -rw-r--r-- | net/wireless/ibss.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index edd062f104f4..e6fdb0b8187d 100644 --- 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, |