[update] With that cfg/iwl_trans->cfg usage corrected, this patch brings Killer series back to live. Thank you. Tested-by: You-Sheng Yang <vicamo@xxxxxxxxx> On 2020-04-27 14:50, You-Sheng Yang wrote: > Hi Luca, > > I have backported this to Ubuntu kernels in my ppa[1], and it doesn't > really fix firmware crash on Killer(R) Wi-Fi 6 AX1650i 160MHz Wireless > Network Adapter (201NGW), REV=0x354 [8086:a0f0] subsystem id [1a56:1651]. > > [1]: https://launchpad.net/~vicamo/+archive/ubuntu/ppa-1874685 > > You-Sheng Yang > > On 2020-04-24 17:20, Luca Coelho wrote: >> From: Luca Coelho <luciano.coelho@xxxxxxxxx> >> >> The killer devices were left out of the checks that convert Qu-B0 to >> QuZ configurations. Add them. >> >> Cc: stable@xxxxxxxxxxxxxxx # v5.3+ >> Fixes: 5a8c31aa6357 ("iwlwifi: pcie: fix recognition of QuZ devices") >> Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx> >> --- >> 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.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 >> >
Attachment:
signature.asc
Description: OpenPGP digital signature
