Commit 7cded565 authored Oct 18, 2019 by Luca Coelho Committed by Kalle Valo Oct 23, 2019

iwlwifi: pcie: fix merge damage on making QnJ exclusive

Two patches were sent out of order: one removed some conditions from
an if and the other moved the code elsewhere. When sending the patch
that moved the code, an older version of the original code was moved,
causing the "make QnJ exclusive" code to be essentially undone.

Fix that by removing the inclusive conditions from the check again.

Fixes: 809805a8 ("iwlwifi: pcie: move some cfg mangling from trans_pcie_alloc to probe")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent d79749f7

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -1067,11 +1067,7 @@ static int iwl_pci_probe(struct pci_dev pdev, const struct pci_device_id ent)
		}
		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
		CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
		((cfg != &iwl_ax200_cfg_cc &&
		cfg != &killer1650x_2ax_cfg &&
		cfg != &killer1650w_2ax_cfg &&
		cfg != &iwl_ax201_cfg_quz_hr) \|\|
		iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
		iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
		u32 hw_status;

		hw_status = iwl_read_prph(iwl_trans, UMAG_GEN_HW_STATUS);