Commit f115fdfd authored May 19, 2015 by Liad Kaufman Committed by Emmanuel Grumbach May 28, 2015

iwlwifi: nvm: fix otp parsing in 8000 hw family



The radio cfg DWORD was taken from the wrong place in the
8000 HW family, after a line in the code was wrongly changed
by mistake. This broke several 8260 devices.

Fixes: 5dd9c68a ("iwlwifi: drop support for early versions of 8000")
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

parent fc8a350d

drivers/net/wireless/iwlwifi/iwl-nvm-parse.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -471,7 +471,7 @@ static int iwl_get_radio_cfg(const struct iwl_cfg cfg, const __le16 nvm_sw,
		if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
		return le16_to_cpup(nvm_sw + RADIO_CFG);

		return le32_to_cpup((__le32 *)(nvm_sw + RADIO_CFG_FAMILY_8000));
		return le32_to_cpup((__le32 *)(phy_sku + RADIO_CFG_FAMILY_8000));

		}