30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
From 9b9322db5c5a1917a66c71fe47c3848a9a31227e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefan Wahren <stefan.wahren@i2se.com>
|
||
|
|
Date: Wed, 14 Mar 2018 20:02:59 +0100
|
||
|
|
Subject: [PATCH] brcmfmac: Fix check for ISO3166 code
|
||
|
|
|
||
|
|
The commit "regulatory: add NUL to request alpha2" increases the length of
|
||
|
|
alpha2 to 3. This causes a regression on brcmfmac, because
|
||
|
|
brcmf_cfg80211_reg_notifier() expect valid ISO3166 codes in the complete
|
||
|
|
array. So fix this accordingly.
|
||
|
|
|
||
|
|
Fixes: 657308f73e67 ("regulatory: add NUL to request alpha2")
|
||
|
|
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||
|
|
Acked-by: Franky Lin <franky.lin@broadcom.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
||
|
|
@@ -6803,7 +6803,7 @@ static void brcmf_cfg80211_reg_notifier(
|
||
|
|
return;
|
||
|
|
|
||
|
|
/* ignore non-ISO3166 country codes */
|
||
|
|
- for (i = 0; i < sizeof(req->alpha2); i++)
|
||
|
|
+ for (i = 0; i < 2; i++)
|
||
|
|
if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {
|
||
|
|
brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n",
|
||
|
|
req->alpha2[0], req->alpha2[1]);
|