[PATCH v5 11/21] wifi: mt76: mt7925: use link-specific removal for non-MLD STA

Sean Wang
2026-04-25T19:51:32Z

Use the default link removal path for non-MLD STA instead of the
multi-link flow.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mt7925/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index bf38d6502970..044043a8768d 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -1338,14 +1338,14 @@ void mt7925_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
struct mt792x_dev *dev = container_of(mdev, struct mt792x_dev, mt76);
struct mt792x_sta *msta = (struct mt792x_sta *)sta->drv_priv;
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
- unsigned long rem;

- rem = ieee80211_vif_is_mld(vif) ? msta->valid_links : BIT(0);
-
- mt7925_mac_sta_remove_links(dev, vif, sta, rem);
-
- if (ieee80211_vif_is_mld(vif))
+ if (ieee80211_vif_is_mld(vif)) {
+ mt7925_mac_sta_remove_links(dev, vif, sta, msta->valid_links);
mt7925_mcu_del_dev(mdev, vif);
+ } else {
+ mt7925_mac_link_sta_remove(mdev, vif, &sta->deflink,
+ &msta->deflink);
+ }

if (vif->type == NL80211_IFTYPE_STATION) {
mvif->wep_sta = NULL;
--
2.43.0