Commit b0b524f0 authored by Shawn Guo's avatar Shawn Guo Committed by Kalle Valo
Browse files

brcmfmac: use ISO3166 country code and 0 rev as fallback 



Instead of aborting country code setup in firmware, use ISO3166 country
code and 0 rev as fallback, when country_codes mapping table is not
configured.  This fallback saves the country_codes table setup for recent
brcmfmac chipsets/firmwares, which just use ISO3166 code and require no
revision number.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210425110200.3050-1-shawn.guo@linaro.org
parent 573f1af8

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+11 −6
Original line number Diff line number Diff line
@@ -7442,18 +7442,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];