diff options
| author | David S. Miller <davem@davemloft.net> | 2022-08-26 13:56:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-08-26 13:56:55 +0300 |
| commit | 643952f3ecace9e20b8a0c5cd1bbd7409ac2d02c (patch) | |
| tree | ee6cf29278a3e461a074cd36d200f581bc864e15 /net/wireless/sme.c | |
| parent | 76d7df9406a1d2faec6eaaa1d835a1dbc1d49cec (diff) | |
| parent | 4ffb4d25ef1251d57881da183d6bec7f2dfe1e32 (diff) | |
| download | linux-643952f3ecace9e20b8a0c5cd1bbd7409ac2d02c.tar.xz | |
Merge tag 'wireless-next-2022-08-26-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next
Johannes berg says:
====================
Various updates:
* rtw88: operation, locking, warning, and code style fixes
* rtw89: small updates
* cfg80211/mac80211: more EHT/MLO (802.11be, WiFi 7) work
* brcmfmac: a couple of fixes
* misc cleanups etc.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 27fb2a0c4052..d513536617bd 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -747,6 +747,9 @@ void __cfg80211_connect_result(struct net_device *dev, if (WARN_ON(!cr->links[link].addr)) goto out; } + + if (WARN_ON(wdev->connect_keys)) + goto out; } wdev->unprot_beacon_reported = 0; @@ -1325,7 +1328,7 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie, NL80211_EXT_FEATURE_BEACON_PROTECTION_CLIENT)) max_key_idx = 7; for (i = 0; i <= max_key_idx; i++) - rdev_del_key(rdev, dev, i, false, NULL); + rdev_del_key(rdev, dev, -1, i, false, NULL); } rdev_set_qos_map(rdev, dev, NULL); |