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

Extend mt7925_mcu_bss_bmc_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-15-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 93ce018a0801f958f7dee9c8c4acc83d02de6a85..48b157f42db9a35f6bc2490df82697213d93ef21 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -2179,12 +2179,13 @@ mt7925_mcu_bss_sec_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)
 static void
 mt7925_mcu_bss_bmc_tlv(struct sk_buff *skb, struct mt792x_phy *phy,
                       struct ieee80211_chanctx_conf *ctx,
-                          struct ieee80211_vif *vif,
+                      struct ieee80211_bss_conf *link_conf,
                           struct ieee80211_sta *sta)
 {
        struct cfg80211_chan_def *chandef = ctx ? &ctx->def : &phy->mt76->chandef;
-       struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
+       struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);
        enum nl80211_band band = chandef->chan->band;
+       struct mt76_vif *mvif = &mconf->mt76;
        struct bss_rate_tlv *bmc;
        struct tlv *tlv;
        u8 idx = mvif->mcast_rates_idx ?
@@ -2335,7 +2336,7 @@ int mt7925_mcu_add_bss_info(struct mt792x_phy *phy,
                                 mvif->sta.deflink.wcid.idx, enable);
        mt7925_mcu_bss_sec_tlv(skb, link_conf->vif);
 
-       mt7925_mcu_bss_bmc_tlv(skb, phy, ctx, link_conf->vif, sta);
+       mt7925_mcu_bss_bmc_tlv(skb, phy, ctx, link_conf, sta);
        mt7925_mcu_bss_qos_tlv(skb, link_conf);
        mt7925_mcu_bss_mld_tlv(skb, link_conf, sta);
        mt7925_mcu_bss_ifs_tlv(skb, link_conf);