]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mt76: mt7996: fix teardown command for an MLD peer
authorShayne Chen <shayne.chen@mediatek.com>
Thu, 6 Nov 2025 06:41:57 +0000 (14:41 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Dec 2025 13:03:14 +0000 (14:03 +0100)
[ Upstream commit e077071e7ac48d5453072f615d51629891c5b90d ]

For an MLD peer, we only need to call the teardown command when removing
the last link, and there's no need to call mt7996_mcu_add_sta() for the
earlier links.

Fixes: c1d6dd5d03eb ("wifi: mt76: mt7996: Add mt7996_mcu_teardown_mld_sta rouine")
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20251106064203.1000505-6-shayne.chen@mediatek.com
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7996/main.c

index 2b52d057287a1f5d579584d4c8e03bd586ad99e2..aa46ea707b406dce7b7e5259ec0efafabeb60217 100644 (file)
@@ -1206,13 +1206,13 @@ mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,
                                mt7996_mac_twt_teardown_flow(dev, link,
                                                             msta_link, i);
 
-                       if (sta->mlo && links == BIT(link_id)) /* last link */
-                               mt7996_mcu_teardown_mld_sta(dev, link,
-                                                           msta_link);
-                       else
+                       if (!sta->mlo)
                                mt7996_mcu_add_sta(dev, link_conf, link_sta,
                                                   link, msta_link,
                                                   CONN_STATE_DISCONNECT, false);
+                       else if (sta->mlo && links == BIT(link_id)) /* last link */
+                               mt7996_mcu_teardown_mld_sta(dev, link,
+                                                           msta_link);
                        msta_link->wcid.sta_disabled = 1;
                        msta_link->wcid.sta = 0;
                        links = links & ~BIT(link_id);