This is a note to let you know that I've just added the patch titled
wifi: cfg80211: fix regulatory disconnect for non-MLO
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
wifi-cfg80211-fix-regulatory-disconnect-for-non-mlo.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b22552fcaf1970360005c805d7fba4046cf2ab4a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri, 16 Jun 2023 22:28:44 +0200
Subject: wifi: cfg80211: fix regulatory disconnect for non-MLO
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit b22552fcaf1970360005c805d7fba4046cf2ab4a upstream.
The multi-link loop here broke disconnect when multi-link
operation (MLO) isn't active for a given interface, since
in that case valid_links is 0 (indicating no links, i.e.
no MLO.)
Fix this by taking that into account properly and skipping
the link only if there are valid_links in the first place.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 7b0a0e3c3a88 ("wifi: cfg80211: do some rework towards MLO link APIs")
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Link: https://lore.kernel.org/r/20230616222844.eb073d650c75.I72739923ef80919889ea9b50de9e4ba4baa836ae@changeid
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/wireless/reg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2390,7 +2390,7 @@ static bool reg_wdev_chan_valid(struct w
if (!wdev->valid_links && link > 0)
break;
- if (!(wdev->valid_links & BIT(link)))
+ if (wdev->valid_links && !(wdev->valid_links & BIT(link)))
continue;
switch (iftype) {
case NL80211_IFTYPE_AP:
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-6.1/netlink-fix-potential-deadlock-in-netlink_set_err.patch
queue-6.1/wifi-cfg80211-fix-regulatory-disconnect-with-ocb-nan.patch
queue-6.1/wifi-mac80211-recalc-min-chandef-for-new-sta-links.patch
queue-6.1/wifi-cfg80211-rewrite-merging-of-inherited-elements.patch
queue-6.1/wifi-iwlwifi-mvm-indicate-hw-decrypt-for-beacon-prot.patch
queue-6.1/wifi-iwlwifi-pull-from-txqs-with-softirqs-disabled.patch
queue-6.1/wifi-ieee80211-fix-the-common-size-calculation-for-r.patch
queue-6.1/wifi-iwlwifi-pcie-fix-null-pointer-dereference-in-iw.patch
queue-6.1/wifi-cfg80211-fix-regulatory-disconnect-for-non-mlo.patch
queue-6.1/wifi-mac80211-fix-permissions-for-valid_links-debugf.patch
queue-6.1/wifi-cfg80211-mac80211-fix-ml-element-common-size-ca.patch
queue-6.1/wifi-mac80211-remove-missing-iftype-sband-data-eht-c.patch
queue-6.1/wifi-cfg80211-drop-incorrect-nontransmitted-bss-upda.patch
