* [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC
2023-11-20 11:12 [PATCH 0/3] wifi: mt76: mt7921: series with CLC patches Mingyen Hsieh
@ 2023-11-20 11:12 ` Mingyen Hsieh
2023-11-21 11:50 ` Kalle Valo
2023-11-20 11:12 ` [PATCH 2/3] wifi: mt76: mt7921: fix CLC command timeout when suspend/resume Mingyen Hsieh
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Mingyen Hsieh @ 2023-11-20 11:12 UTC (permalink / raw)
To: nbd, lorenzo
Cc: deren.wu, Sean.Wang, Soul.Huang, Leon.Yen, Eric-SY.Chang, km.lin,
robin.chiu, ch.yeh, posh.sun, Quan.Zhou, Ryder.Lee, Shayne.Chen,
linux-wireless, linux-mediatek, Ming Yen Hsieh
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Due to the increase in the number of power tables 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: 23bdc5d8cadf ("wifi: mt76: mt7921: introduce Country Location Control support")
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
v2:
- Convert type of buf_len from "__le16" to "u16"
---
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 753a4fc45c70..e4edea1ab3dd 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -1264,6 +1264,7 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
u8 mtcl_conf;
u8 rsvd[62];
} __packed req = {
+ .ver = 1,
.idx = idx,
.env = env_cap,
.env_6g = dev->phy.power_type,
@@ -1271,7 +1272,8 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
.mtcl_conf = mt792x_acpi_get_mtcl_conf(&dev->phy, alpha2),
};
int ret, valid_cnt = 0;
- u8 i, *pos;
+ u16 buf_len = 0;
+ u8 *pos;
if (!clc)
return 0;
@@ -1281,12 +1283,15 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
if (mt76_find_power_limits_node(&dev->mt76))
req.cap |= CLC_CAP_DTS_EN;
+ buf_len = le16_to_cpu(clc->len) - sizeof(*clc);
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;
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] ||
rule->alpha2[1] != alpha2[1])
continue;
--
2.18.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC
2023-11-20 11:12 ` [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC Mingyen Hsieh
@ 2023-11-21 11:50 ` Kalle Valo
0 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2023-11-21 11:50 UTC (permalink / raw)
To: Mingyen Hsieh
Cc: nbd, lorenzo, deren.wu, Sean.Wang, Soul.Huang, Leon.Yen,
Eric-SY.Chang, km.lin, robin.chiu, ch.yeh, posh.sun, Quan.Zhou,
Ryder.Lee, Shayne.Chen, linux-wireless, linux-mediatek
Mingyen Hsieh <mingyen.hsieh@mediatek.com> writes:
> From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
>
> Due to the increase in the number of power tables 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: 23bdc5d8cadf ("wifi: mt76: mt7921: introduce Country Location Control support")
> Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
>
> v2:
> - Convert type of buf_len from "__le16" to "u16"
>
> ---
> drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
The changelog ('v2:....') should be after '---' line.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] wifi: mt76: mt7921: fix CLC command timeout when suspend/resume
2023-11-20 11:12 [PATCH 0/3] wifi: mt76: mt7921: series with CLC patches Mingyen Hsieh
2023-11-20 11:12 ` [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC Mingyen Hsieh
@ 2023-11-20 11:12 ` Mingyen Hsieh
2023-11-20 11:12 ` [PATCH 3/3] wifi: mt76: mt7921: fix wrong 6Ghz power type Mingyen Hsieh
2023-11-21 11:49 ` [PATCH 0/3] wifi: mt76: mt7921: series with CLC patches Kalle Valo
3 siblings, 0 replies; 8+ messages in thread
From: Mingyen Hsieh @ 2023-11-20 11:12 UTC (permalink / raw)
To: nbd, lorenzo
Cc: deren.wu, Sean.Wang, Soul.Huang, Leon.Yen, Eric-SY.Chang, km.lin,
robin.chiu, ch.yeh, posh.sun, Quan.Zhou, Ryder.Lee, Shayne.Chen,
linux-wireless, linux-mediatek, Ming Yen Hsieh
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
When enter suspend/resume while in a connected state, the upper layer
will trigger disconnection before entering suspend, and at the same time,
it will trigger regd_notifier() and update CLC, causing the CLC event to
not be received due to suspend, resulting in a command timeout.
Therefore, the update of CLC is postponed until resume, to ensure data
consistency and avoid the occurrence of command timeout.
Fixes: 4fc8df50fd41 ("wifi: mt76: mt7921: get regulatory information from the clc event")
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7921/init.c | 23 +++++++++++++++----
.../wireless/mediatek/mt76/mt7921/mt7921.h | 1 +
.../net/wireless/mediatek/mt76/mt7921/pci.c | 3 +++
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index 7d6a9d746011..48433c6d5e7d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -110,24 +110,37 @@ mt7921_regd_channel_update(struct wiphy *wiphy, struct mt792x_dev *dev)
}
}
+void mt7921_regd_update(struct mt792x_dev *dev)
+{
+ struct mt76_dev *mdev = &dev->mt76;
+ struct ieee80211_hw *hw = mdev->hw;
+ struct wiphy *wiphy = hw->wiphy;
+
+ mt7921_mcu_set_clc(dev, mdev->alpha2, dev->country_ie_env);
+ mt7921_regd_channel_update(wiphy, dev);
+ mt76_connac_mcu_set_channel_domain(hw->priv);
+ mt7921_set_tx_sar_pwr(hw, NULL);
+}
+EXPORT_SYMBOL_GPL(mt7921_regd_update);
+
static void
mt7921_regd_notifier(struct wiphy *wiphy,
struct regulatory_request *request)
{
struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
struct mt792x_dev *dev = mt792x_hw_dev(hw);
+ struct mt76_connac_pm *pm = &dev->pm;
memcpy(dev->mt76.alpha2, request->alpha2, sizeof(dev->mt76.alpha2));
dev->mt76.region = request->dfs_region;
dev->country_ie_env = request->country_ie_env;
+ if (pm->suspended)
+ return;
+
mt792x_mutex_acquire(dev);
- mt7921_mcu_set_clc(dev, request->alpha2, request->country_ie_env);
- mt76_connac_mcu_set_channel_domain(hw->priv);
- mt7921_set_tx_sar_pwr(hw, NULL);
+ mt7921_regd_update(dev);
mt792x_mutex_release(dev);
-
- mt7921_regd_channel_update(wiphy, dev);
}
int mt7921_mac_init(struct mt792x_dev *dev)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index f28621121927..5c4cc370e6ce 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -233,6 +233,7 @@ mt7921_l1_rmw(struct mt792x_dev *dev, u32 addr, u32 mask, u32 val)
#define mt7921_l1_set(dev, addr, val) mt7921_l1_rmw(dev, addr, 0, val)
#define mt7921_l1_clear(dev, addr, val) mt7921_l1_rmw(dev, addr, val, 0)
+void mt7921_regd_update(struct mt792x_dev *dev);
int mt7921_mac_init(struct mt792x_dev *dev);
bool mt7921_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask);
int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
index f04e7095e181..42fd456eb6fa 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
@@ -507,6 +507,9 @@ static int mt7921_pci_resume(struct device *device)
mt76_connac_mcu_set_deep_sleep(&dev->mt76, false);
err = mt76_connac_mcu_set_hif_suspend(mdev, false);
+
+ mt7921_regd_update(dev);
+
failed:
pm->suspended = false;
--
2.18.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] wifi: mt76: mt7921: fix wrong 6Ghz power type
2023-11-20 11:12 [PATCH 0/3] wifi: mt76: mt7921: series with CLC patches Mingyen Hsieh
2023-11-20 11:12 ` [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC Mingyen Hsieh
2023-11-20 11:12 ` [PATCH 2/3] wifi: mt76: mt7921: fix CLC command timeout when suspend/resume Mingyen Hsieh
@ 2023-11-20 11:12 ` Mingyen Hsieh
2023-11-21 11:49 ` [PATCH 0/3] wifi: mt76: mt7921: series with CLC patches Kalle Valo
3 siblings, 0 replies; 8+ messages in thread
From: Mingyen Hsieh @ 2023-11-20 11:12 UTC (permalink / raw)
To: nbd, lorenzo
Cc: deren.wu, Sean.Wang, Soul.Huang, Leon.Yen, Eric-SY.Chang, km.lin,
robin.chiu, ch.yeh, posh.sun, Quan.Zhou, Ryder.Lee, Shayne.Chen,
linux-wireless, linux-mediatek, Ming Yen Hsieh
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
To avoid using incorrect 6g power settings after disconnection,
it should to update back to the default state when disconnected.
Fixes: 51ba0e3a15eb ("wifi: mt76: mt7921: add 6GHz power type support for clc")
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
---
.../net/wireless/mediatek/mt76/mt7921/main.c | 38 +++++++++++++++++--
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 510a575a973b..0645417e0582 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -683,17 +683,45 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw,
}
static void
-mt7921_regd_set_6ghz_power_type(struct ieee80211_vif *vif)
+mt7921_calc_vif_num(void *priv, u8 *mac, struct ieee80211_vif *vif)
+{
+ u32 *num = priv;
+
+ if (!priv)
+ return;
+
+ switch (vif->type) {
+ case NL80211_IFTYPE_STATION:
+ case NL80211_IFTYPE_P2P_CLIENT:
+ case NL80211_IFTYPE_AP:
+ case NL80211_IFTYPE_P2P_GO:
+ *num += 1;
+ break;
+ default:
+ break;
+ }
+}
+
+static void
+mt7921_regd_set_6ghz_power_type(struct ieee80211_vif *vif, bool is_add)
{
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
struct mt792x_phy *phy = mvif->phy;
struct mt792x_dev *dev = phy->dev;
+ u32 valid_vif_num = 0;
+
+ ieee80211_iterate_active_interfaces(mt76_hw(dev),
+ IEEE80211_IFACE_ITER_RESUME_ALL,
+ mt7921_calc_vif_num, &valid_vif_num);
- if (hweight64(dev->mt76.vif_mask) > 1) {
+ if (valid_vif_num > 1) {
phy->power_type = MT_AP_DEFAULT;
goto out;
}
+ if (!is_add)
+ vif->bss_conf.power_type = IEEE80211_REG_UNSET_AP;
+
switch (vif->bss_conf.power_type) {
case IEEE80211_REG_SP_AP:
phy->power_type = MT_AP_SP;
@@ -705,6 +733,8 @@ mt7921_regd_set_6ghz_power_type(struct ieee80211_vif *vif)
phy->power_type = MT_AP_LPI;
break;
case IEEE80211_REG_UNSET_AP:
+ phy->power_type = MT_AP_UNSET;
+ break;
default:
phy->power_type = MT_AP_DEFAULT;
break;
@@ -749,7 +779,7 @@ int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
if (ret)
return ret;
- mt7921_regd_set_6ghz_power_type(vif);
+ mt7921_regd_set_6ghz_power_type(vif, true);
mt76_connac_power_save_sched(&dev->mphy, &dev->pm);
@@ -811,6 +841,8 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
list_del_init(&msta->wcid.poll_list);
spin_unlock_bh(&dev->mt76.sta_poll_lock);
+ mt7921_regd_set_6ghz_power_type(vif, false);
+
mt76_connac_power_save_sched(&dev->mphy, &dev->pm);
}
EXPORT_SYMBOL_GPL(mt7921_mac_sta_remove);
--
2.18.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/3] wifi: mt76: mt7921: series with CLC patches
2023-11-20 11:12 [PATCH 0/3] wifi: mt76: mt7921: series with CLC patches Mingyen Hsieh
` (2 preceding siblings ...)
2023-11-20 11:12 ` [PATCH 3/3] wifi: mt76: mt7921: fix wrong 6Ghz power type Mingyen Hsieh
@ 2023-11-21 11:49 ` Kalle Valo
3 siblings, 0 replies; 8+ messages in thread
From: Kalle Valo @ 2023-11-21 11:49 UTC (permalink / raw)
To: Mingyen Hsieh
Cc: nbd, lorenzo, deren.wu, Sean.Wang, Soul.Huang, Leon.Yen,
Eric-SY.Chang, km.lin, robin.chiu, ch.yeh, posh.sun, Quan.Zhou,
Ryder.Lee, Shayne.Chen, linux-wireless, linux-mediatek
Mingyen Hsieh <mingyen.hsieh@mediatek.com> writes:
> From: Ming Yen Hsieh <MingYen.Hsieh@mediatek.com>
>
> Sync internal mt7921 patches for CLC.
>
> ---
>
> Ming Yen Hsieh (3):
> wifi: mt76: mt7921: fix country count limitation for CLC
> wifi: mt76: mt7921: fix CLC command timeout when suspend/resume
> wifi: mt76: mt7921: fix wrong 6Ghz power type
v2 missing from subject. Please carefully read the wiki link below.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC
2023-11-20 3:27 Mingyen Hsieh
@ 2023-11-20 3:27 ` Mingyen Hsieh
2023-11-20 9:04 ` Lorenzo Bianconi
0 siblings, 1 reply; 8+ messages in thread
From: Mingyen Hsieh @ 2023-11-20 3:27 UTC (permalink / raw)
To: nbd, lorenzo
Cc: deren.wu, Sean.Wang, Soul.Huang, Leon.Yen, Eric-SY.Chang, km.lin,
robin.chiu, ch.yeh, posh.sun, Quan.Zhou, Ryder.Lee, Shayne.Chen,
linux-wireless, linux-mediatek, Ming Yen Hsieh
From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Due to the increase in the number of power tables 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: 23bdc5d8cadf ("wifi: mt76: mt7921: introduce Country Location Control support")
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 753a4fc45c70..e4edea1ab3dd 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -1264,6 +1264,7 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
u8 mtcl_conf;
u8 rsvd[62];
} __packed req = {
+ .ver = 1,
.idx = idx,
.env = env_cap,
.env_6g = dev->phy.power_type,
@@ -1271,7 +1272,8 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
.mtcl_conf = mt792x_acpi_get_mtcl_conf(&dev->phy, alpha2),
};
int ret, valid_cnt = 0;
- u8 i, *pos;
+ __le16 buf_len = 0;
+ u8 *pos;
if (!clc)
return 0;
@@ -1281,12 +1283,15 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
if (mt76_find_power_limits_node(&dev->mt76))
req.cap |= CLC_CAP_DTS_EN;
+ buf_len = le16_to_cpu(clc->len) - sizeof(*clc);
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;
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] ||
rule->alpha2[1] != alpha2[1])
continue;
--
2.18.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC
2023-11-20 3:27 ` [PATCH 1/3] wifi: mt76: mt7921: fix country count limitation for CLC Mingyen Hsieh
@ 2023-11-20 9:04 ` Lorenzo Bianconi
0 siblings, 0 replies; 8+ messages in thread
From: Lorenzo Bianconi @ 2023-11-20 9:04 UTC (permalink / raw)
To: Mingyen Hsieh
Cc: nbd, deren.wu, Sean.Wang, Soul.Huang, Leon.Yen, Eric-SY.Chang,
km.lin, robin.chiu, ch.yeh, posh.sun, Quan.Zhou, Ryder.Lee,
Shayne.Chen, linux-wireless, linux-mediatek
[-- Attachment #1: Type: text/plain, Size: 2194 bytes --]
> From: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
>
> Due to the increase in the number of power tables 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: 23bdc5d8cadf ("wifi: mt76: mt7921: introduce Country Location Control support")
> Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
> ---
> drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> index 753a4fc45c70..e4edea1ab3dd 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
> @@ -1264,6 +1264,7 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
> u8 mtcl_conf;
> u8 rsvd[62];
> } __packed req = {
> + .ver = 1,
> .idx = idx,
> .env = env_cap,
> .env_6g = dev->phy.power_type,
> @@ -1271,7 +1272,8 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
> .mtcl_conf = mt792x_acpi_get_mtcl_conf(&dev->phy, alpha2),
> };
> int ret, valid_cnt = 0;
> - u8 i, *pos;
> + __le16 buf_len = 0;
I think here should be:
u16 buf_len;
Regards,
Lorenzo
> + u8 *pos;
>
> if (!clc)
> return 0;
> @@ -1281,12 +1283,15 @@ int __mt7921_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
> if (mt76_find_power_limits_node(&dev->mt76))
> req.cap |= CLC_CAP_DTS_EN;
>
> + buf_len = le16_to_cpu(clc->len) - sizeof(*clc);
> 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;
> 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] ||
> rule->alpha2[1] != alpha2[1])
> continue;
> --
> 2.18.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread