mac80211: backport brcmfmac to support multiple devices NVRAM

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45577

1 files changed, 29 insertions, 0 deletions

diff --git a/package/kernel/mac80211/patches/355-brcmfmac-update-wiphy-band-information-upon-updating.patch b/package/kernel/mac80211/patches/355-brcmfmac-update-wiphy-band-information-upon-updating.patch
new file mode 100644
index 0000000000..a0c22eb411
--- /dev/null
+++ b/package/kernel/mac80211/patches/355-brcmfmac-update-wiphy-band-information-upon-updating.patch
@@ -0,0 +1,29 @@
+From: Arend van Spriel <arend@broadcom.com>
+Date: Tue, 14 Apr 2015 20:10:25 +0200
+Subject: [PATCH] brcmfmac: update wiphy band information upon updating
+ regulatory domain
+
+When change the country code the available channels may change. So
+the wiphy bands should be updated accordingly.
+
+Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
+Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Signed-off-by: Arend van Spriel <arend@broadcom.com>
+---
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+@@ -6022,7 +6022,11 @@ static void brcmf_cfg80211_reg_notifier(
+ 	memset(&ccreq, 0, sizeof(ccreq));
+ 	ccreq.rev = cpu_to_le32(-1);
+ 	memcpy(ccreq.ccode, req->alpha2, sizeof(req->alpha2));
+-	brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq));
++	if (brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq))) {
++		brcmf_err("firmware rejected country setting\n");
++		return;
++	}
++	brcmf_setup_wiphybands(wiphy);
+ }
+ 
+ static void brcmf_free_wiphy(struct wiphy *wiphy)