2022-02-13 11:40:03

by Chad Monroe

[permalink] [raw]
Subject: [PATCH] mt76: connac: adjust wlan_idx size from u8 to u16

Newer chips such as MT7915 require up to 16-bits for this field.

Signed-off-by: Chad Monroe <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index cdd82a62eeb1..f3fdd755a3bb 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2656,7 +2656,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_ext_tlv);
int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
- struct mt76_phy *phy, u8 wlan_idx,
+ struct mt76_phy *phy, u16 wlan_idx,
bool enable)
{
struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 7b9d82dd3f9d..384c3eab1c8a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1642,7 +1642,7 @@ void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,
int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
struct ieee80211_vif *vif,
struct ieee80211_sta *sta,
- struct mt76_phy *phy, u8 wlan_idx,
+ struct mt76_phy *phy, u16 wlan_idx,
bool enable);
void mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,
struct ieee80211_sta *sta);
--
2.32.0 (Apple Git-132)


2022-02-14 14:07:09

by Lorenzo Bianconi

[permalink] [raw]
Subject: Re: [PATCH] mt76: connac: adjust wlan_idx size from u8 to u16

Thx for fixing it.
I guess we can add the following Fixes tag:

Fixes: 49126ac1f8d26 ("mt76: connac: move mt76_connac_mcu_bss_basic_tlv in connac module")

Anyway:

Acked-by: Lorenzo Bianconi <[email protected]>

> Newer chips such as MT7915 require up to 16-bits for this field.
>
> Signed-off-by: Chad Monroe <[email protected]>
> ---
> drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 +-
> drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> index cdd82a62eeb1..f3fdd755a3bb 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
> @@ -2656,7 +2656,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_ext_tlv);
> int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
> struct ieee80211_vif *vif,
> struct ieee80211_sta *sta,
> - struct mt76_phy *phy, u8 wlan_idx,
> + struct mt76_phy *phy, u16 wlan_idx,
> bool enable)
> {
> struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> index 7b9d82dd3f9d..384c3eab1c8a 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
> @@ -1642,7 +1642,7 @@ void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,
> int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
> struct ieee80211_vif *vif,
> struct ieee80211_sta *sta,
> - struct mt76_phy *phy, u8 wlan_idx,
> + struct mt76_phy *phy, u16 wlan_idx,
> bool enable);
> void mt76_connac_mcu_sta_uapsd(struct sk_buff *skb, struct ieee80211_vif *vif,
> struct ieee80211_sta *sta);
> --
> 2.32.0 (Apple Git-132)
>


Attachments:
(No filename) (1.96 kB)
signature.asc (235.00 B)
Download all attachments