diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2020-08-04 14:02:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2020-08-04 14:02:54 +0300 |
| commit | 2cfd71f1a43e9e1053db6c84f2dc33fe88128f67 (patch) | |
| tree | 777ad43d30e00597687256da0d5a1f966df99f3e /drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | |
| parent | 3dc05ffb04436020f63138186dbc4f37bd938552 (diff) | |
| parent | 1cfd3426ef989b83fa6176490a38777057e57f6c (diff) | |
| download | linux-stable-2cfd71f1a43e9e1053db6c84f2dc33fe88128f67.tar.gz linux-stable-2cfd71f1a43e9e1053db6c84f2dc33fe88128f67.tar.bz2 linux-stable-2cfd71f1a43e9e1053db6c84f2dc33fe88128f67.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
mt76 driver had major conflicts within mt7615 directory. To make it easier for
every merge wireless-drivers to wireless-drivers-next and solve those
conflicts.
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c index 99611515a093..bacb1f10a699 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]); } |