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

Extend mt7925_mcu_set_bss_pm 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-19-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 457e1fa2fde1e38e5c46c5d593b70e410d361167..aeed2c777a20981f5da881f135b61129605484b3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -1263,7 +1263,7 @@ mt7925_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        if (err)
                goto out;
 
-       err = mt7925_mcu_set_bss_pm(dev, vif, true);
+       err = mt7925_mcu_set_bss_pm(dev, link_conf, true);
        if (err)
                goto out;
 
@@ -1285,7 +1285,7 @@ mt7925_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 
        mt792x_mutex_acquire(dev);
 
-       err = mt7925_mcu_set_bss_pm(dev, vif, false);
+       err = mt7925_mcu_set_bss_pm(dev, link_conf, false);
        if (err)
                goto out;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 18e19ffdbb7ee4630dd67cd9101a5b4ded3bae0e..0350f0e34690b1a993e1d9ad6982e75d7b427dc1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -1319,10 +1319,11 @@ mt7925_mcu_uni_bss_bcnft(struct mt792x_dev *dev, struct ieee80211_vif *vif,
 }
 
 int
-mt7925_mcu_set_bss_pm(struct mt792x_dev *dev, struct ieee80211_vif *vif,
+mt7925_mcu_set_bss_pm(struct mt792x_dev *dev,
+                     struct ieee80211_bss_conf *link_conf,
                      bool enable)
 {
-       struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+       struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf);
        struct {
                struct {
                        u8 bss_idx;
@@ -1339,13 +1340,13 @@ mt7925_mcu_set_bss_pm(struct mt792x_dev *dev, struct ieee80211_vif *vif,
                } __packed enable;
        } req = {
                .hdr = {
-                       .bss_idx = mvif->bss_conf.mt76.idx,
+                       .bss_idx = mconf->mt76.idx,
                },
                .enable = {
                        .tag = cpu_to_le16(UNI_BSS_INFO_BCNFT),
                        .len = cpu_to_le16(sizeof(struct bcnft_tlv)),
-                       .dtim_period = vif->bss_conf.dtim_period,
-                       .bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int),
+                       .dtim_period = link_conf->dtim_period,
+                       .bcn_interval = cpu_to_le16(link_conf->beacon_int),
                },
        };
        struct {
@@ -1359,7 +1360,7 @@ mt7925_mcu_set_bss_pm(struct mt792x_dev *dev, struct ieee80211_vif *vif,
                } __packed disable;
        } req1 = {
                .hdr = {
-                       .bss_idx = mvif->bss_conf.mt76.idx,
+                       .bss_idx = mconf->mt76.idx,
                },
                .disable = {
                        .tag = cpu_to_le16(UNI_BSS_INFO_PM_DISABLE),
@@ -1693,7 +1694,7 @@ int mt7925_mcu_set_beacon_filter(struct mt792x_dev *dev,
                                               MT_WF_RFCR_DROP_OTHER_BEACON);
        }
 
-       err = mt7925_mcu_set_bss_pm(dev, vif, false);
+       err = mt7925_mcu_set_bss_pm(dev, &vif->bss_conf, false);
        if (err)
                return err;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
index f689f7a359ea6b518a83031e6c3c5e21cbdcfcdc..07ea03195e4e93efd4bf958768d7058319ed055b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
@@ -192,7 +192,8 @@ int __mt7925_start(struct mt792x_phy *phy);
 int mt7925_register_device(struct mt792x_dev *dev);
 void mt7925_unregister_device(struct mt792x_dev *dev);
 int mt7925_run_firmware(struct mt792x_dev *dev);
-int mt7925_mcu_set_bss_pm(struct mt792x_dev *dev, struct ieee80211_vif *vif,
+int mt7925_mcu_set_bss_pm(struct mt792x_dev *dev,
+                         struct ieee80211_bss_conf *link_conf,
                          bool enable);
 int mt7925_mcu_sta_update(struct mt792x_dev *dev, struct ieee80211_sta *sta,
                          struct ieee80211_vif *vif, bool enable,