diff mbox series

wifi: brcmfmac: Use ISO3166 country code and rev 0 as fallback on 4356

Message ID 20230303222331.285663-1-hdegoede@redhat.com (mailing list archive)
State Accepted
Commit 659fda7f35f0d11126edfb6c6cd9ace99a2525c0
Delegated to: Kalle Valo
Headers show
Series wifi: brcmfmac: Use ISO3166 country code and rev 0 as fallback on 4356 | expand

Commit Message

Hans de Goede March 3, 2023, 10:23 p.m. UTC
Many devices ship with a nvram ccode value of X2/XT/XU/XV/ALL which are
all special world-wide compatibility ccode-s. Most of these world-wide
ccode-s allow passive scan mode only for 2.4GHz channels 12-14,
only enabling them when an AP is seen on them.

Since linux-firmware has moved to the new cyfmac4356-pci.bin +
cyfmac4356-pci.clm_blob firmware files this no longer works and
4356 devices using e.g. an X2 ccode fail to connect to an AP on
channel 13.

Add the 4356 chip-id to the list of chips for which to use the ISO3166
country code + rev 0 as fallback in brcmf_translate_country_code() to
fix this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kalle Valo March 13, 2023, 1:43 p.m. UTC | #1
Hans de Goede <hdegoede@redhat.com> wrote:

> Many devices ship with a nvram ccode value of X2/XT/XU/XV/ALL which are
> all special world-wide compatibility ccode-s. Most of these world-wide
> ccode-s allow passive scan mode only for 2.4GHz channels 12-14,
> only enabling them when an AP is seen on them.
> 
> Since linux-firmware has moved to the new cyfmac4356-pci.bin +
> cyfmac4356-pci.clm_blob firmware files this no longer works and
> 4356 devices using e.g. an X2 ccode fail to connect to an AP on
> channel 13.
> 
> Add the 4356 chip-id to the list of chips for which to use the ISO3166
> country code + rev 0 as fallback in brcmf_translate_country_code() to
> fix this.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Patch applied to wireless-next.git, thanks.

659fda7f35f0 wifi: brcmfmac: Use ISO3166 country code and rev 0 as fallback on 4356
diff mbox series

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index b115902eb475..5b9bb4d07c2a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -7763,6 +7763,7 @@  static bool brmcf_use_iso3166_ccode_fallback(struct brcmf_pub *drvr)
 	switch (drvr->bus_if->chip) {
 	case BRCM_CC_43430_CHIP_ID:
 	case BRCM_CC_4345_CHIP_ID:
+	case BRCM_CC_4356_CHIP_ID:
 	case BRCM_CC_43602_CHIP_ID:
 		return true;
 	default: