Merge tag 'mt76-for-kvalo-2020-12-04' of https://github.com/nbd168/wireless
authorKalle Valo <kvalo@codeaurora.org>
Tue, 8 Dec 2020 07:39:43 +0000 (09:39 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 8 Dec 2020 07:39:43 +0000 (09:39 +0200)
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

1  2 
drivers/net/wireless/mediatek/mt76/usb.c

index f1ae9ff835b23380fa2912d6a2196661d3c9b4a8,81393788f98ea382cca687386e1451bb7b6ec7e6..dc850109de22d66a9755a75db5a9164d88dcf557
@@@ -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) {
        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);