From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 27 Aug 2024 09:30:04 +0000 (+0200)
Subject: wifi: mt76: mt7915: hold dev->mt76.mutex while disabling tx worker
X-Git-Tag: v6.12-rc1~232^2~41^2~1^2~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8f7152f10cb434f954aeff85ca1be9cd4d01912b;p=linux-block.git

wifi: mt76: mt7915: hold dev->mt76.mutex while disabling tx worker

Prevent racing against other functions disabling the same worker

Link: https://patch.msgid.link/20240827093011.18621-17-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index dcec27be5a40..fc03cb499e71 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1538,12 +1538,14 @@ void mt7915_mac_reset_work(struct work_struct *work)
 		set_bit(MT76_RESET, &phy2->mt76->state);
 		cancel_delayed_work_sync(&phy2->mt76->mac_work);
 	}
+
+	mutex_lock(&dev->mt76.mutex);
+
 	mt76_worker_disable(&dev->mt76.tx_worker);
 	mt76_for_each_q_rx(&dev->mt76, i)
 		napi_disable(&dev->mt76.napi[i]);
 	napi_disable(&dev->mt76.tx_napi);
 
-	mutex_lock(&dev->mt76.mutex);
 
 	if (mtk_wed_device_active(&dev->mt76.mmio.wed))
 		mtk_wed_device_stop(&dev->mt76.mmio.wed);