brcmfmac: Restore ISO3166 and 0 rev as a fallback

Commit b0b524f079a2 ("brcmfmac: use ISO3166 country code and 0 rev
as fallback") was a welcome addition for Raspberry Pi as it replaced
an equivalent bit of downstream code. Commit 151a7c12c4fc reverted
it because it broke BCM4359/9 devices.

This is a renamed reversion of the reversion.

See: https://github.com/raspberrypi/Raspberry-Pi-OS-64bit/issues/217

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 077852e..94ab63d 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -7465,18 +7465,23 @@ static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],
        s32 found_index;
        int i;
 
-       country_codes = drvr->settings->country_codes;
-       if (!country_codes) {
-               brcmf_dbg(TRACE, "No country codes configured for device\n");
-               return -EINVAL;
-       }
-
        if ((alpha2[0] == ccreq->country_abbrev[0]) &&
            (alpha2[1] == ccreq->country_abbrev[1])) {
                brcmf_dbg(TRACE, "Country code already set\n");
                return -EAGAIN;
        }
 
+       country_codes = drvr->settings->country_codes;
+       if (!country_codes) {
+               brcmf_dbg(TRACE, "No country codes configured for device, using ISO3166 code and 0 rev\n");
+               memset(ccreq, 0, sizeof(*ccreq));
+               ccreq->country_abbrev[0] = alpha2[0];
+               ccreq->country_abbrev[1] = alpha2[1];
+               ccreq->ccode[0] = alpha2[0];
+               ccreq->ccode[1] = alpha2[1];
+               return 0;
+       }
+
        found_index = -1;
        for (i = 0; i < country_codes->table_size; i++) {
                cc = &country_codes->table[i];