OpenWrt – Blame information for rev 4
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
4 | office | 1 | From 9b9322db5c5a1917a66c71fe47c3848a9a31227e Mon Sep 17 00:00:00 2001 |
2 | From: Stefan Wahren <stefan.wahren@i2se.com> |
||
3 | Date: Wed, 14 Mar 2018 20:02:59 +0100 |
||
4 | Subject: [PATCH] brcmfmac: Fix check for ISO3166 code |
||
5 | |||
6 | The commit "regulatory: add NUL to request alpha2" increases the length of |
||
7 | alpha2 to 3. This causes a regression on brcmfmac, because |
||
8 | brcmf_cfg80211_reg_notifier() expect valid ISO3166 codes in the complete |
||
9 | array. So fix this accordingly. |
||
10 | |||
11 | Fixes: 657308f73e67 ("regulatory: add NUL to request alpha2") |
||
12 | Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> |
||
13 | Acked-by: Franky Lin <franky.lin@broadcom.com> |
||
14 | Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
||
15 | --- |
||
16 | drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- |
||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
||
18 | |||
19 | --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |
||
20 | +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c |
||
21 | @@ -6803,7 +6803,7 @@ static void brcmf_cfg80211_reg_notifier( |
||
22 | return; |
||
23 | |||
24 | /* ignore non-ISO3166 country codes */ |
||
25 | - for (i = 0; i < sizeof(req->alpha2); i++) |
||
26 | + for (i = 0; i < 2; i++) |
||
27 | if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { |
||
28 | brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n", |
||
29 | req->alpha2[0], req->alpha2[1]); |