LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] iwlwifi: trans: fix killer series loadded incorrect firmware
@ 2019-05-13 13:33 Cyrus Lien
  2019-05-14  5:56 ` Luca Coelho
  0 siblings, 1 reply; 2+ messages in thread
From: Cyrus Lien @ 2019-05-13 13:33 UTC (permalink / raw)
  To: Johannes Berg, Emmanuel Grumbach, Luca Coelho,
	Intel Linux Wireless, Kalle Valo, David S. Miller,
	Shahar S Matityahu, Sara Sharon, Golan Ben Ami, Lior Cohen,
	Shaul Triebitz, linux-wireless, netdev, linux-kernel
  Cc: Cyrus Lien

Killer series loadded IWL_22000_HR_B_FW_PRE prefixed firmware instead
IWL_CC_A_FW_PRE prefixed firmware.

Add killer series to the check logic as iwl_ax200_cfg_cc.

Signed-off-by: Cyrus Lien <cyrus.lien@canonical.com>
---
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 79c1dc05f948..576c2186b6bf 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3565,7 +3565,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 		}
 	} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
 		   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
-		   (trans->cfg != &iwl_ax200_cfg_cc ||
+		   ((trans->cfg != &iwl_ax200_cfg_cc &&
+		     trans->cfg != &killer1650x_2ax_cfg &&
+		     trans->cfg != &killer1650w_2ax_cfg) ||
 		    trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
 		u32 hw_status;
 
-- 
2.17.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-14  5:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-13 13:33 [PATCH] iwlwifi: trans: fix killer series loadded incorrect firmware Cyrus Lien
2019-05-14  5:56 ` Luca Coelho

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).