diff options
| author | Felix Fietkau <nbd@nbd.name> | 2024-08-27 11:30:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-10-10 12:00:22 +0200 |
| commit | 3f1e70b5de01568bc2364a4b7879779b4c31fb8f (patch) | |
| tree | a163b1e07c3d85b70bb566e8ff3d1148fb563a9d | |
| parent | a6d1b64eedbf904d1fee90a0fca9eb5d61d540d9 (diff) | |
| download | linux-stable-3f1e70b5de01568bc2364a4b7879779b4c31fb8f.tar.gz linux-stable-3f1e70b5de01568bc2364a4b7879779b4c31fb8f.tar.bz2 linux-stable-3f1e70b5de01568bc2364a4b7879779b4c31fb8f.zip | |
wifi: mt76: mt7915: hold dev->mt76.mutex while disabling tx worker
[ Upstream commit 8f7152f10cb434f954aeff85ca1be9cd4d01912b ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c index 8008ce3fa6c7..387d47e9fcd3 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c @@ -1537,12 +1537,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); |