wifi: mt76: mt7925: extend mt7925_mcu_sta_he_6g_tlv for per-link STA

Extend mt7925_mcu_sta_he_6g_tlv with the per-link STA configuration.

The patch we created is a prerequisite to enable the MLO function in the
driver. It is purely a refactoring patch so the functionality should
remain unchanged.

Co-developed-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Signed-off-by: Ming Yen Hsieh <mingyen.hsieh@mediatek.com>
Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20240613030241.5771-29-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 0c9cebd3ee71464d23e2f7699d45af5a7524dc6f..e1dc8452468c9ef83c7749d4faff31a54abb5365 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -1389,18 +1389,19 @@ mt7925_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
 }
 
 static void
-mt7925_mcu_sta_he_6g_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
+mt7925_mcu_sta_he_6g_tlv(struct sk_buff *skb,
+                        struct ieee80211_link_sta *link_sta)
 {
        struct sta_rec_he_6g_capa *he_6g;
        struct tlv *tlv;
 
-       if (!sta->deflink.he_6ghz_capa.capa)
+       if (!link_sta->he_6ghz_capa.capa)
                return;
 
        tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_HE_6G, sizeof(*he_6g));
 
        he_6g = (struct sta_rec_he_6g_capa *)tlv;
-       he_6g->capa = sta->deflink.he_6ghz_capa.capa;
+       he_6g->capa = link_sta->he_6ghz_capa.capa;
 }
 
 static void
@@ -1640,7 +1641,7 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy,
                mt76_connac_mcu_sta_uapsd(skb, info->vif, info->link_sta->sta);
                mt7925_mcu_sta_amsdu_tlv(skb, info->vif, info->link_sta->sta);
                mt7925_mcu_sta_he_tlv(skb, info->link_sta->sta);
-               mt7925_mcu_sta_he_6g_tlv(skb, info->link_sta->sta);
+               mt7925_mcu_sta_he_6g_tlv(skb, info->link_sta);
                mt7925_mcu_sta_eht_tlv(skb, info->link_sta);
                mt7925_mcu_sta_rate_ctrl_tlv(skb, info->vif,
                                             info->link_sta);