wifi: mt76: mt7996: Clear wcid pointer in mt7996_mac_sta_deinit_link()

LorenzoBianconi · gregkh · commit 455a48685fee · 2026-05-23T13:06:27.000+02:00
[ Upstream commit 8897324 ] Clear WCID pointer removing the sta link in mt7996_mac_sta_deinit_link routine. Fixes: dd82a9e ("wifi: mt76: mt7996: Rely on mt7996_sta_link in sta_add/sta_remove callbacks") Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Link: https://patch.msgid.link/20251205-mt76-txq-wicd-fix-v2-4-f19ba48af7c1@kernel.org Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c
@@ -1032,6 +1032,7 @@ void mt7996_mac_sta_deinit_link(struct mt7996_dev *dev,
 		list_del_init(&msta_link->rc_list);
 	spin_unlock_bh(&dev->mt76.sta_poll_lock);
 
+	rcu_assign_pointer(dev->mt76.wcid[msta_link->wcid.idx], NULL);
 	mt76_wcid_cleanup(&dev->mt76, &msta_link->wcid);
 	mt76_wcid_mask_clear(dev->mt76.wcid_mask, msta_link->wcid.idx);
 }

Original file line number	Diff line number	Diff line change
`@@ -1032,6 +1032,7 @@ void mt7996_mac_sta_deinit_link(struct mt7996_dev *dev,`
`1032`	`1032`	`list_del_init(&msta_link->rc_list);`
`1033`	`1033`	`spin_unlock_bh(&dev->mt76.sta_poll_lock);`
`1034`	`1034`
	`1035`	`+ rcu_assign_pointer(dev->mt76.wcid[msta_link->wcid.idx], NULL);`
`1035`	`1036`	`mt76_wcid_cleanup(&dev->mt76, &msta_link->wcid);`
`1036`	`1037`	`mt76_wcid_mask_clear(dev->mt76.wcid_mask, msta_link->wcid.idx);`
`1037`	`1038`	`}`