From: Luca Coelho <luca@coelho.fi> Date: Fri, 24 Apr 2020 12:20:08 +0300 Subject: [PATCH v5.7] iwlwifi: pcie: handle QuZ configs with killer NICs as well From: Luca Coelho <luciano.coelho@intel.com> The killer devices were left out of the checks that convert Qu-B0 to QuZ configurations. Add them. Cc: stable@vger.kernel.org # v5.3+ Fixes: 5a8c31aa6357 ("iwlwifi: pcie: fix recognition of QuZ devices") Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Tested-by: You-Sheng Yang <vicamo@gmail.com> [ Rebased for 5.6 / tmb ] Signed-off-by: Thomas Backlund <tmb@mageia.org> --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 ++++ 1 file changed, 4 insertions(+) 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. @@ -1156,6 +1156,10 @@ static int iwl_pci_probe(struct pci_dev cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc; else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; + else if (cfg == &killer1650s_2ax_cfg_qu_b0_hr_b0) + cfg = &iwl_ax1650s_cfg_quz_hr; + else if (cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0) + cfg = &iwl_ax1650i_cfg_quz_hr; } #endif