diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-19 12:09:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-19 12:09:45 -0700 |
| commit | f25641c08cbe81f83dc1aca6247244345a9a8f26 (patch) | |
| tree | 6b834313ad5c189cc90ccc11383cf18d15cf6181 | |
| parent | ef01cee2ee1b369c57a936166483d40942bcc3e3 (diff) | |
| parent | f92f26f2ed2c9f92c9270c705bca96310c3cdf5a (diff) | |
| download | linux-f25641c08cbe81f83dc1aca6247244345a9a8f26.tar.gz linux-f25641c08cbe81f83dc1aca6247244345a9a8f26.tar.bz2 linux-f25641c08cbe81f83dc1aca6247244345a9a8f26.zip | |
Merge tag 'wireless-drivers-2020-05-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
Kalle Valo says:
====================
wireless-drivers fixes for v5.7
Third and most likely the last set of fixes for v5.7. Only one
iwlwifi fix this time.
iwlwifi
* another fix for QuZ device configuration
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 6744c0281ffb..29971c25dba4 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1092,6 +1092,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) iwl_trans->cfg = &iwl_ax101_cfg_quz_hr; else 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 |