iwlwifi: pcie: don't switch FW to qnj when ax201 is detected
authorLuca Coelho <luciano.coelho@intel.com>
Fri, 16 Aug 2019 12:55:53 +0000 (15:55 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 20 Aug 2019 14:00:41 +0000 (17:00 +0300)
We have a too generic condition that switches from Qu configurations
to QnJ configurations.  We need to exclude some configurations so that
they are not erroneously switched.  Add the ax201 configuration to the
list of exclusions.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/intel/iwlwifi/pcie/trans.c

index f5df5b370d78b585dd277b61b86c00498b8e5f74..935e35dafce54d408f8c5130a9425b263786deb9 100644 (file)
@@ -3603,6 +3603,7 @@ 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_ax201_cfg_qu_hr &&
                     trans->cfg != &killer1650x_2ax_cfg &&
                     trans->cfg != &killer1650w_2ax_cfg &&
                     trans->cfg != &iwl_ax201_cfg_quz_hr) ||