From 5f14b347e6b189f8f50e8fd410edeaa441e5cff1 Mon Sep 17 00:00:00 2001 From: Owen Huang Date: Mon, 6 Jan 2025 01:54:54 -0600 Subject: [PATCH 3/4] brcmfmac: ignore country IE with regulatory info from associated AP Originally, FMAC don't support change country code dynamically, so set country code will be rejected after receiving regulatory info from associated AP. But driver will be set to wrong country code if iw command working fine. We don't want to follow up AP's country code, so add flag REGULATORY_COUNTRY_IE_IGNORE to avoid country code to be changed by country IE. Fixes SWLINUX-4940 Signed-off-by: Owen Huang --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 93438dad7bb6..02baba1f60ae 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -10670,6 +10670,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr, brcmf_dbg(INFO, "Registering custom regulatory\n"); wiphy->reg_notifier = brcmf_cfg80211_reg_notifier; wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG; + wiphy->regulatory_flags |= REGULATORY_COUNTRY_IE_IGNORE; wiphy_apply_custom_regulatory(wiphy, &brcmf_regdom); /* firmware defaults to 40MHz disabled in 2G band. We signal -- 2.25.0