wifi: mt76: mt7925: add mt7925_mac_link_sta_remove to remove per-link STA

The mt7925_mac_link_sta_remove function currently removes the per-link STA.
We will extend this function when we implement the MLO functionality.

This patch only includes structural changes and does not involve any
logic changes.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20240613030241.5771-45-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 202bd84716abdf4349892e0668f76e60f2718c73..21a2d1bd8d186c0ba50e484806bb7b2695712a1f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -806,39 +806,55 @@ void mt7925_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,
 }
 EXPORT_SYMBOL_GPL(mt7925_mac_sta_assoc);
 
-void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
-                          struct ieee80211_sta *sta)
+static void mt7925_mac_link_sta_remove(struct mt76_dev *mdev,
+                                      struct ieee80211_vif *vif,
+                                      struct ieee80211_link_sta *link_sta)
 {
        struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);
-       struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv;
        struct ieee80211_bss_conf *link_conf;
+       struct mt792x_link_sta *mlink;
+       struct mt792x_sta *msta;
 
-       mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->deflink.wcid);
+       msta = (struct mt792x_sta *)link_sta->sta->drv_priv;
+       mlink = mt792x_sta_to_link(msta, link_sta->link_id);
+
+       mt76_connac_free_pending_tx_skbs(&dev->pm, &mlink->wcid);
        mt76_connac_pm_wake(&dev->mphy, &dev->pm);
 
-       mt7925_mcu_sta_update(dev, &sta->deflink, vif, false, MT76_STA_INFO_STATE_NONE);
-       mt7925_mac_wtbl_update(dev, msta->deflink.wcid.idx,
+       mt7925_mcu_sta_update(dev, link_sta, vif, false,
+                             MT76_STA_INFO_STATE_NONE);
+       mt7925_mac_wtbl_update(dev, mlink->wcid.idx,
                               MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
 
        link_conf = mt792x_vif_to_bss_conf(vif, vif->bss_conf.link_id);
 
-       if (vif->type == NL80211_IFTYPE_STATION) {
+       if (vif->type == NL80211_IFTYPE_STATION && !link_sta->sta->tdls) {
                struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
-
-               mvif->wep_sta = NULL;
-               ewma_rssi_init(&mvif->bss_conf.rssi);
-               if (!sta->tdls)
-                       mt7925_mcu_add_bss_info(&dev->phy, mvif->bss_conf.mt76.ctx,
-                                               link_conf, &sta->deflink, false);
+               mt7925_mcu_add_bss_info(&dev->phy,
+                                       mvif->bss_conf.mt76.ctx, link_conf,
+                                       link_sta, false);
        }
 
        spin_lock_bh(&mdev->sta_poll_lock);
-       if (!list_empty(&msta->deflink.wcid.poll_list))
-               list_del_init(&msta->deflink.wcid.poll_list);
+       if (!list_empty(&mlink->wcid.poll_list))
+               list_del_init(&mlink->wcid.poll_list);
        spin_unlock_bh(&mdev->sta_poll_lock);
 
        mt76_connac_power_save_sched(&dev->mphy, &dev->pm);
 }
+
+void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
+                          struct ieee80211_sta *sta)
+{
+       mt7925_mac_link_sta_remove(mdev, vif, &sta->deflink);
+
+       if (vif->type == NL80211_IFTYPE_STATION) {
+               struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+
+               mvif->wep_sta = NULL;
+               ewma_rssi_init(&mvif->bss_conf.rssi);
+       }
+}
 EXPORT_SYMBOL_GPL(mt7925_mac_sta_remove);
 
 static int mt7925_set_rts_threshold(struct ieee80211_hw *hw, u32 val)