wifi: mt76: mt7925: extend mt7925_mcu_bss_mld_tlv for per-link BSS

Extend mt7925_mcu_bss_mld_tlv with per-link BSS 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: 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-14-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 d6a590061e363aac475e70797898de1950ca1938..93ce018a0801f958f7dee9c8c4acc83d02de6a85 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -2206,20 +2206,20 @@ mt7925_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt792x_phy *phy,
 
 static void
 mt7925_mcu_bss_mld_tlv(struct sk_buff *skb,
-                      struct ieee80211_vif *vif,
+                      struct ieee80211_bss_conf *link_conf,
                       struct ieee80211_sta *sta)
 {
-       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
-       bool is_mld = ieee80211_vif_is_mld(vif);
+       struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);
+       bool is_mld = ieee80211_vif_is_mld(link_conf->vif);
        struct bss_mld_tlv *mld;
        struct tlv *tlv;
 
        tlv = mt76_connac_mcu_add_tlv(skb, UNI_BSS_INFO_MLD, sizeof(*mld));
        mld = (struct bss_mld_tlv *)tlv;
 
-       mld->link_id = sta ? (is_mld ? vif->bss_conf.link_id : 0) : 0xff;
-       mld->group_mld_id = is_mld ? mvif->bss_conf.mt76.idx : 0xff;
-       mld->own_mld_id = mvif->bss_conf.mt76.idx + 32;
+       mld->link_id = sta ? (is_mld ? link_conf->link_id : 0) : 0xff;
+       mld->group_mld_id = is_mld ? mconf->mt76.idx : 0xff;
+       mld->own_mld_id = mconf->mt76.idx + 32;
        mld->remap_idx = 0xff;
 
        if (sta)
@@ -2337,7 +2337,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,
 
        mt7925_mcu_bss_bmc_tlv(skb, phy, ctx, link_conf->vif, sta);
        mt7925_mcu_bss_qos_tlv(skb, link_conf);
-       mt7925_mcu_bss_mld_tlv(skb, link_conf->vif, sta);
+       mt7925_mcu_bss_mld_tlv(skb, link_conf, sta);
        mt7925_mcu_bss_ifs_tlv(skb, link_conf);
 
        if (link_conf->he_support) {