| Message ID | 20200615181341.81871-1-nbd@nbd.name (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4ac668a3b8c9d3477a3fe162c1cfeb867dd65de8 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [5.8] mt76: mt76x02: do not access uninitialized NAPI structs | expand |
Felix Fietkau <nbd@nbd.name> wrote: > Fixes a crash on MMIO devices when running into the watchdog reset > > Fixes: d3377b78cec6 ("mt76: add HE phy modes and hardware queue") > Signed-off-by: Felix Fietkau <nbd@nbd.name> Patch applied to wireless-drivers.git, thanks. 4ac668a3b8c9 mt76: mt76x02: do not access uninitialized NAPI structs
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c index cbbe986655fe..5fda6e7b120c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c @@ -456,8 +456,9 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev) tasklet_disable(&dev->mt76.tx_tasklet); napi_disable(&dev->mt76.tx_napi); - for (i = 0; i < ARRAY_SIZE(dev->mt76.napi); i++) + mt76_for_each_q_rx(&dev->mt76, i) { napi_disable(&dev->mt76.napi[i]); + } mutex_lock(&dev->mt76.mutex); @@ -515,7 +516,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev) tasklet_enable(&dev->mt76.pre_tbtt_tasklet); - for (i = 0; i < ARRAY_SIZE(dev->mt76.napi); i++) { + mt76_for_each_q_rx(&dev->mt76, i) { napi_enable(&dev->mt76.napi[i]); napi_schedule(&dev->mt76.napi[i]); }
Fixes a crash on MMIO devices when running into the watchdog reset Fixes: d3377b78cec6 ("mt76: add HE phy modes and hardware queue") Signed-off-by: Felix Fietkau <nbd@nbd.name> --- drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)