]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: mt76: mt7925: make WCID cleanup unconditional in sta_remove_links()
authorSean Wang <sean.wang@mediatek.com>
Fri, 6 Mar 2026 23:22:32 +0000 (17:22 -0600)
committerFelix Fietkau <nbd@nbd.name>
Tue, 24 Mar 2026 15:49:32 +0000 (15:49 +0000)
Drop the dead pri_link check in mt7925_mac_sta_remove_links() and
perform WCID cleanup unconditionally.

mlink->pri_link is already cleared before the test, making the branch
ineffective. This matches the actual teardown behaviour and simplifies
the remove path.

No functional change intended.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20260306232238.2039675-14-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7925/main.c

index 151dc79f7c12c8b99a8a0a7343dbad4e2a51c431..584d989fb4e8e2225f031c0ab4f9e0f347738c36 100644 (file)
@@ -1221,10 +1221,8 @@ mt7925_mac_sta_remove_links(struct mt792x_dev *dev, struct ieee80211_vif *vif,
                mlink->sta = NULL;
                mlink->pri_link = NULL;
 
-               if (link_sta != mlink->pri_link) {
-                       mt76_wcid_cleanup(mdev, wcid);
-                       mt76_wcid_mask_clear(mdev->wcid_mask, wcid->idx);
-               }
+               mt76_wcid_cleanup(mdev, wcid);
+               mt76_wcid_mask_clear(mdev->wcid_mask, wcid->idx);
 
                if (msta->deflink_id == link_id)
                        msta->deflink_id = IEEE80211_LINK_UNSPECIFIED;