From: Kalle Valo <kvalo@codeaurora.org>
Date: Tue, 8 Dec 2020 07:39:43 +0000 (+0200)
Subject: Merge tag 'mt76-for-kvalo-2020-12-04' of https://github.com/nbd168/wireless
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d3b6fab909525cce715a281c5c19ce2ab7b3fcec;p=linux.git

Merge tag 'mt76-for-kvalo-2020-12-04' of https://github.com/nbd168/wireless

mt76 patches for 5.11

* mt7915 fixes
* mt7615 fixes
* support for more sta interfaces on mt7615/mt7915
* mt7915 encap offload
* performance improvements
* channel noise report on mt7915
* usb/sdio support improvements
* mt7915 testmode support
* mt7915 DBDC support
* warning fixes
---

d3b6fab909525cce715a281c5c19ce2ab7b3fcec
diff --cc drivers/net/wireless/mediatek/mt76/usb.c
index f1ae9ff835b23,81393788f98ea..dc850109de22d
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@@ -1020,6 -1039,9 +1039,8 @@@ void mt76u_stop_tx(struct mt76_dev *dev
  {
  	int ret;
  
 -	mt76_worker_disable(&dev->tx_worker);
+ 	mt76_worker_disable(&dev->usb.status_worker);
+ 
  	ret = wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(&dev->phy),
  				 HZ / 5);
  	if (!ret) {
@@@ -1061,6 -1078,9 +1082,8 @@@
  	cancel_work_sync(&dev->usb.stat_work);
  	clear_bit(MT76_READING_STATS, &dev->phy.state);
  
 -	mt76_worker_enable(&dev->tx_worker);
+ 	mt76_worker_enable(&dev->usb.status_worker);
+ 
  	mt76_tx_status_check(dev, NULL, true);
  }
  EXPORT_SYMBOL_GPL(mt76u_stop_tx);