summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede2017-03-08 14:50:16 +0100
committerKalle Valo2017-03-20 18:14:17 +0100
commit26e537884a8ef451f5c60f6949b1615069931ffa (patch)
tree251762ae430cb3ed6bc076b4e366ef4adef6311c
parentbrcmfmac: Do not print the firmware version as an error (diff)
downloadkernel-qcow2-linux-26e537884a8ef451f5c60f6949b1615069931ffa.tar.gz
kernel-qcow2-linux-26e537884a8ef451f5c60f6949b1615069931ffa.tar.xz
kernel-qcow2-linux-26e537884a8ef451f5c60f6949b1615069931ffa.zip
brcmfmac: Do not complain about country code "00"
The country code gets set to "00" by default at boot, ignore this rather then logging an error about it. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 944b83cfc519..7765ad09d793 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -6736,6 +6736,10 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
s32 err;
int i;
+ /* The country code gets set to "00" by default at boot, ignore */
+ if (req->alpha2[0] == '0' && req->alpha2[1] == '0')
+ return;
+
/* ignore non-ISO3166 country codes */
for (i = 0; i < sizeof(req->alpha2); i++)
if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {