From 23ae4fbb83a6763df4242328d85332b200ca4aba Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 18 Feb 2019 15:43:30 +0000 Subject: [PATCH 355/432] Revert "brcmfmac: Mute expected startup 'errors'" This reverts commit 34eba9138ccf8d84552ab9dae37d8f348640e663. Upstream patch 26e537884a ("brcmfmac: Do not complain about country code "00") fixes the same issue, so drop this downstream patch. Signed-off-by: Phil Elwell --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 75c8623468f4..72822c828a99 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -6838,8 +6838,6 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy, /* ignore non-ISO3166 country codes */ for (i = 0; i < 2; i++) if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { - if (req->alpha2[0] == '0' && req->alpha2[1] == '0') - return; brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n", req->alpha2[0], req->alpha2[1]); return; -- 2.19.1