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

Extend mt7925_mcu_sta_eht_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-28-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 266010c0e00a2319fb70a0680c4706fb8d567560..0c9cebd3ee71464d23e2f7699d45af5a7524dc6f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -1404,18 +1404,18 @@ mt7925_mcu_sta_he_6g_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
 }
 
 static void
-mt7925_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
+mt7925_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_link_sta *link_sta)
 {
        struct ieee80211_eht_mcs_nss_supp *mcs_map;
        struct ieee80211_eht_cap_elem_fixed *elem;
        struct sta_rec_eht *eht;
        struct tlv *tlv;
 
-       if (!sta->deflink.eht_cap.has_eht)
+       if (!link_sta->eht_cap.has_eht)
                return;
 
-       mcs_map = &sta->deflink.eht_cap.eht_mcs_nss_supp;
-       elem = &sta->deflink.eht_cap.eht_cap_elem;
+       mcs_map = &link_sta->eht_cap.eht_mcs_nss_supp;
+       elem = &link_sta->eht_cap.eht_cap_elem;
 
        tlv = mt76_connac_mcu_add_tlv(skb, STA_REC_EHT, sizeof(*eht));
 
@@ -1425,7 +1425,7 @@ mt7925_mcu_sta_eht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta)
        eht->phy_cap = cpu_to_le64(*(u64 *)elem->phy_cap_info);
        eht->phy_cap_ext = cpu_to_le64(elem->phy_cap_info[8]);
 
-       if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_20)
+       if (link_sta->bandwidth == IEEE80211_STA_RX_BW_20)
                memcpy(eht->mcs_map_bw20, &mcs_map->only_20mhz, sizeof(eht->mcs_map_bw20));
        memcpy(eht->mcs_map_bw80, &mcs_map->bw._80, sizeof(eht->mcs_map_bw80));
        memcpy(eht->mcs_map_bw160, &mcs_map->bw._160, sizeof(eht->mcs_map_bw160));
@@ -1641,7 +1641,7 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy,
                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_eht_tlv(skb, info->link_sta->sta);
+               mt7925_mcu_sta_eht_tlv(skb, info->link_sta);
                mt7925_mcu_sta_rate_ctrl_tlv(skb, info->vif,
                                             info->link_sta);
                mt7925_mcu_sta_state_v2_tlv(phy, skb, info->link_sta,