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

Extend mt7925_mcu_sta_state_v2_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-26-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 9b69b4b178de73f4e2efa0f0cdf77fca02dc7b3b..45437603763e2872227eadf8f1cd53bd467ecc9a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -1540,7 +1540,7 @@ mt7925_mcu_sta_phy_tlv(struct sk_buff *skb,
 
 static void
 mt7925_mcu_sta_state_v2_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
-                           struct ieee80211_sta *sta,
+                           struct ieee80211_link_sta *link_sta,
                            struct ieee80211_vif *vif,
                            u8 rcpi, u8 sta_state)
 {
@@ -1560,9 +1560,9 @@ mt7925_mcu_sta_state_v2_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
        state = (struct sta_rec_state_v2 *)tlv;
        state->state = sta_state;
 
-       if (sta->deflink.vht_cap.vht_supported) {
-               state->vht_opmode = sta->deflink.bandwidth;
-               state->vht_opmode |= sta->deflink.rx_nss <<
+       if (link_sta->vht_cap.vht_supported) {
+               state->vht_opmode = link_sta->bandwidth;
+               state->vht_opmode |= link_sta->rx_nss <<
                        IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT;
        }
 }
@@ -1643,7 +1643,7 @@ mt7925_mcu_sta_cmd(struct mt76_phy *phy,
                mt7925_mcu_sta_eht_tlv(skb, info->link_sta->sta);
                mt7925_mcu_sta_rate_ctrl_tlv(skb, info->vif,
                                             info->link_sta->sta);
-               mt7925_mcu_sta_state_v2_tlv(phy, skb, info->link_sta->sta,
+               mt7925_mcu_sta_state_v2_tlv(phy, skb, info->link_sta,
                                            info->vif, info->rcpi,
                                            info->state);
                mt7925_mcu_sta_mld_tlv(skb, info->vif, info->link_sta->sta);