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

Extend mt7925_mcu_bss_ifs_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-10-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 b82cc1bd09b64f137b180ab560ada3dedf0c8743..7cde18e273d8045e085618bb913afe6220200954 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -2282,9 +2282,10 @@ mt7925_mcu_bss_color_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
 }
 
 static void
-mt7925_mcu_bss_ifs_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)
+mt7925_mcu_bss_ifs_tlv(struct sk_buff *skb,
+                      struct ieee80211_bss_conf *link_conf)
 {
-       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+       struct mt792x_vif *mvif = (struct mt792x_vif *)link_conf->vif->drv_priv;
        struct mt792x_phy *phy = mvif->phy;
        struct bss_ifs_time_tlv *ifs_time;
        struct tlv *tlv;
@@ -2307,7 +2308,7 @@ int mt7925_mcu_set_timing(struct mt792x_phy *phy,
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
-       mt7925_mcu_bss_ifs_tlv(skb, link_conf->vif);
+       mt7925_mcu_bss_ifs_tlv(skb, link_conf);
 
        return mt76_mcu_skb_send_msg(&dev->mt76, skb,
                                     MCU_UNI_CMD(BSS_INFO_UPDATE), true);
@@ -2337,7 +2338,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->vif);
        mt7925_mcu_bss_mld_tlv(skb, link_conf->vif, sta);
-       mt7925_mcu_bss_ifs_tlv(skb, link_conf->vif);
+       mt7925_mcu_bss_ifs_tlv(skb, link_conf);
 
        if (link_conf->he_support) {
                mt7925_mcu_bss_he_tlv(skb, link_conf->vif, phy);