aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-03-21 10:45:30 +0100
committerRafał Miłecki <rafal@milecki.pl>2017-03-21 10:45:30 +0100
commit13006712eab665d606d217fccbb8f609287e2c8b (patch)
treea11f59d1699b1fd6cefd6afde667a145a2795a06 /package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch
parent8fae77fc9bb783fcaeb58d94e1ce05ef41fe193c (diff)
downloadupstream-13006712eab665d606d217fccbb8f609287e2c8b.tar.gz
upstream-13006712eab665d606d217fccbb8f609287e2c8b.tar.bz2
upstream-13006712eab665d606d217fccbb8f609287e2c8b.zip
mac80211: brcmfmac: backport patches pushed on 2017-03-20
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch')
-rw-r--r--package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch b/package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch
new file mode 100644
index 0000000000..f4570e71b1
--- /dev/null
+++ b/package/kernel/mac80211/patches/323-0004-brcmfmac-Do-not-complain-about-country-code-00.patch
@@ -0,0 +1,28 @@
+From 26e537884a8ef451f5c60f6949b1615069931ffa Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 8 Mar 2017 14:50:16 +0100
+Subject: [PATCH] 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>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- 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(
+ 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') {