APPLIED(E)/cmt: [SRU][OEM-OSP1-B/E/U/OEM-5.6][PATCH 1/1] UBUNTU: SAUCE: iwlwifi: pcie: handle QuZ configs with killer NICs as well

[Khaled Elmously]

Also changed the provenence as Stefan described.



On 2020-04-28 12:17:12 , You-Sheng Yang wrote:
> From: Luca Coelho <luciano.coelho at intel.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1874685
> 
> The killer devices were left out of the checks that convert Qu-B0 to
> QuZ configurations.  Add them.
> 
> Cc: stable at vger.kernel.org # v5.3+
> Fixes: 5a8c31aa6357 ("iwlwifi: pcie: fix recognition of QuZ devices")
> Signed-off-by: Luca Coelho <luciano.coelho at intel.com>
> (backported from
> https://lore.kernel.org/linux-wireless/iwlwifi.20200424121518.b715acfbe211.I273a098064a22577e4fca767910fd9cf0013f5cb@changeid/raw)
> Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
> ---
>  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 b7c16d5cde93..6cc3349d189b 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
> @@ -1088,6 +1088,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  			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)
> +			iwl_trans->cfg = &iwl_ax1650s_cfg_quz_hr;
> +		else if (cfg == &killer1650i_2ax_cfg_qu_b0_hr_b0)
> +			iwl_trans->cfg = &iwl_ax1650i_cfg_quz_hr;
>  	}
>  
>  #endif
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team