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

Extend mt7925_mcu_set_timing 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-9-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index 7b9deb586b34209e6c9b080eefc06c297cc73b89..6a1afff923991fc423eea5be2f79a5b631e88ecf 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -1400,7 +1400,7 @@ static void mt7925_link_info_changed(struct ieee80211_hw *hw,
 
                if (slottime != phy->slottime) {
                        phy->slottime = slottime;
-                       mt7925_mcu_set_timing(phy, vif);
+                       mt7925_mcu_set_timing(phy, info);
                }
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index fb261ee525bef4eea4df113b446d225b2b809727..b82cc1bd09b64f137b180ab560ada3dedf0c8743 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -2296,9 +2296,9 @@ mt7925_mcu_bss_ifs_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)
 }
 
 int mt7925_mcu_set_timing(struct mt792x_phy *phy,
-                         struct ieee80211_vif *vif)
+                         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_dev *dev = phy->dev;
        struct sk_buff *skb;
 
@@ -2307,7 +2307,7 @@ int mt7925_mcu_set_timing(struct mt792x_phy *phy,
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 
-       mt7925_mcu_bss_ifs_tlv(skb, vif);
+       mt7925_mcu_bss_ifs_tlv(skb, link_conf->vif);
 
        return mt76_mcu_skb_send_msg(&dev->mt76, skb,
                                     MCU_UNI_CMD(BSS_INFO_UPDATE), true);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
index c692996e057c69cd5894d3babc696c342d890609..d3584743c2665f2557da31e0e7767ab8857d61a2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h
@@ -582,7 +582,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,
                            struct ieee80211_sta *sta,
                            int enable);
 int mt7925_mcu_set_timing(struct mt792x_phy *phy,
-                         struct ieee80211_vif *vif);
+                         struct ieee80211_bss_conf *link_conf);
 int mt7925_mcu_set_deep_sleep(struct mt792x_dev *dev, bool enable);
 int mt7925_mcu_set_channel_domain(struct mt76_phy *phy);
 int mt7925_mcu_set_radio_en(struct mt792x_phy *phy, bool enable);