Commit 2b0e2b0f authored Dec 25, 2014 by Arik Nemtsov Committed by Emmanuel Grumbach Jan 05, 2015

iwlwifi: pcie: correctly define 7265-D cfg



The trans cfg was not replaced for 7265-D cards. This led to a check of
the min-NVM version against a 7265-C card, causing very-old 7265-D cards
to operate incorrectly with the driver.

Fixes: 3fd0d3c1 ("iwlwifi: pcie: support 7265-D devices")
Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

parent baa21e83

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -527,8 +527,10 @@ static int iwl_pci_probe(struct pci_dev pdev, const struct pci_device_id ent)
		else if (cfg == &iwl7265_n_cfg)
		cfg_7265d = &iwl7265d_n_cfg;
		if (cfg_7265d &&
		(iwl_trans->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D)
		(iwl_trans->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_7265D) {
		cfg = cfg_7265d;
		iwl_trans->cfg = cfg_7265d;
		}
		#endif

		pci_set_drvdata(pdev, iwl_trans);