]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mwifiex: send world regulatory domain to driver
authorStefan Kerkmann <s.kerkmann@pengutronix.de>
Mon, 4 Aug 2025 14:16:59 +0000 (16:16 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Oct 2025 09:56:32 +0000 (11:56 +0200)
[ Upstream commit 56819d00bc2ebaa6308913c28680da5d896852b8 ]

The world regulatory domain is a restrictive subset of channel
configurations which allows legal operation of the adapter all over the
world. Changing to this domain should not be prevented.

Fixes: dd4a9ac05c8e1 ("mwifiex: send regulatory domain info to firmware only if alpha2 changed") changed
Signed-off-by: Stefan Kerkmann <s.kerkmann@pengutronix.de>
Reviewed-by: Jeff Chen <jeff.chen_1@nxp.con>
Link: https://patch.msgid.link/20250804-fix-mwifiex-regulatory-domain-v1-1-e4715c770c4d@pengutronix.de
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/marvell/mwifiex/cfg80211.c

index 5e25060647b2d1a825833df85bf0689e3ea0882c..3b9b75eb4cdb8418d8b0a5a0b0ab986618354953 100644 (file)
@@ -659,10 +659,9 @@ static void mwifiex_reg_notifier(struct wiphy *wiphy,
                return;
        }
 
-       /* Don't send world or same regdom info to firmware */
-       if (strncmp(request->alpha2, "00", 2) &&
-           strncmp(request->alpha2, adapter->country_code,
-                   sizeof(request->alpha2))) {
+       /* Don't send same regdom info to firmware */
+       if (strncmp(request->alpha2, adapter->country_code,
+                   sizeof(request->alpha2)) != 0) {
                memcpy(adapter->country_code, request->alpha2,
                       sizeof(request->alpha2));
                mwifiex_send_domain_info_cmd_fw(wiphy);