Merge tag 'wireless-drivers-next-2020-05-25' of git://git.kernel.org/pub/scm/linux...

Kalle Valo says:

====================
wireless-drivers-next patches for v5.8

Second set of patches for v5.8. Lots of new features and new supported
hardware for mt76. Also rtw88 got new hardware support.

Major changes:

rtw88

* add support for Realtek 8723DE PCI adapter

* rename rtw88.ko/rtwpci.ko to rtw88_core.ko/rtw88_pci.ko

iwlwifi

* stop supporting swcrypto and bt_coex_active module parameters on
  mvm devices

* enable A-AMSDU in low latency

mt76

* new devices for mt76x0/mt76x2

* support for non-offload firmware on mt7663

* hw/sched scan support for mt7663

* mt7615/mt7663 MSI support

* TDLS support

* mt7603/mt7615 rate control fixes

* new driver for mt7915

* wowlan support for mt7663

* suspend/resume support for mt7663
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index b91a7753038bcd1531c043bc03c7f745192ab98d,f179cd08b4189de0d0835b3c47619a7c52a387e2..65d65c6baf4c344e463d781b6d3a099caddc80f7
--- 1/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
--- 2/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@@ -1108,14 -1069,8 +1069,12 @@@ static int iwl_pci_probe(struct pci_de
  
        /* same thing for QuZ... */
        if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
-               if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)
-                       iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;
-               else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
+               if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
                        iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;
 +              else if (iwl_trans->cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0)
 +                      iwl_trans->cfg = &iwl_ax1650s_cfg_quz_hr;
 +              else if (iwl_trans->cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0)
 +                      iwl_trans->cfg = &iwl_ax1650i_cfg_quz_hr;
        }
  
  #endif