android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: mt76: mt7921: fix country count limitation for CLC

Browse Source 
[ Upstream commit fa6ad88e023ddfa6c5dcdb466d159e89f451e305 ]

Due to the increase in the number of power tables for 6Ghz on CLC,
the variable nr_country is no longer sufficient to represent the
total quantity. Therefore, we have switched to calculating the
length of clc buf to obtain the correct power table. Additionally,
the version number has been incremented to 1.

Fixes: 23bdc5d8ca ("wifi: mt76: mt7921: introduce Country Location Control support")
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ming Yen Hsieh 2023-11-22 11:06:44 +08:00 committed by Greg Kroah-Hartman
parent fe002eeda4
commit 0c9318d49e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
View File

@ -1036,21 +1036,26 @@ int __mt7921_mcu_set_clc(struct mt7921_dev *dev, u8 *alpha2,
u8 type[2]; u8 type[2];
u8 rsvd[64]; u8 rsvd[64];
} __packed req = { } __packed req = {
.ver = 1,
.idx = idx, .idx = idx,
.env = env_cap, .env = env_cap,
}; };
int ret, valid_cnt = 0; int ret, valid_cnt = 0;
u8 i, *pos; u16 buf_len = 0;
u8 *pos;
if (!clc) if (!clc)
return 0; return 0;
buf_len = le16_to_cpu(clc->len) - sizeof(*clc);
pos = clc->data; pos = clc->data;
for (i = 0; i < clc->nr_country; i++) { while (buf_len > 16) {
struct mt7921_clc_rule *rule = (struct mt7921_clc_rule *)pos; struct mt7921_clc_rule *rule = (struct mt7921_clc_rule *)pos;
u16 len = le16_to_cpu(rule->len); u16 len = le16_to_cpu(rule->len);
u16 offset = len + sizeof(*rule);
pos += len + sizeof(*rule); pos += offset;
buf_len -= offset;
if (rule->alpha2[0] != alpha2[0] || if (rule->alpha2[0] != alpha2[0] ||
rule->alpha2[1] != alpha2[1]) rule->alpha2[1] != alpha2[1])
continue; continue;