diff mbox series

[1/2] wifi: cfg80211: fix regulatory disconnect for non-MLO

Message ID 20230616222122.eb073d650c75.I72739923ef80919889ea9b50de9e4ba4baa836ae@changeid (mailing list archive)
State Superseded
Delegated to: Johannes Berg
Headers show
Series [1/2] wifi: cfg80211: fix regulatory disconnect for non-MLO | expand

Commit Message

Johannes Berg June 16, 2023, 8:21 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

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.

Fixes: 7b0a0e3c3a88 ("wifi: cfg80211: do some rework towards MLO link APIs")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/wireless/reg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 26f11e4746c0..f5ea1f373ab7 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2352,7 +2352,7 @@  static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev)
 
 		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: