Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ab4c86 authored by Eran Harary's avatar Eran Harary Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: fixes for 8000 NVM flow 



The nvm_file should be loaded by default for SDIO
procucts only. Change the configuration accordingly.
While at it, fix a typo in the device name.

Signed-off-by: default avatarEran Harary <eran.harary@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent c2d20201

drivers/net/wireless/iwlwifi/iwl-8000.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -119,10 +119,9 @@ const struct iwl_cfg iwl8260_2ac_cfg = { 
	.ht_params = &iwl8000_ht_params,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.default_nvm_file = DEFAULT_NVM_FILE_FAMILY_8000,

};

};





const struct iwl_cfg iwl8260_n_cfg = {

const struct iwl_cfg iwl8260_2ac_sdio_cfg = {

	.name = "Intel(R) Dual Band Wireless-AC 8260",

	.name = "Intel(R) Dual Band Wireless-AC 8260",

	.fw_name_pre = IWL8000_FW_PRE,

	.fw_name_pre = IWL8000_FW_PRE,

	IWL_DEVICE_8000,

	IWL_DEVICE_8000,

drivers/net/wireless/iwlwifi/iwl-config.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -337,7 +337,7 @@ extern const struct iwl_cfg iwl7265_2ac_cfg; 
extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_2n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

extern const struct iwl_cfg iwl7265_n_cfg;

extern const struct iwl_cfg iwl8260_2ac_cfg;

extern const struct iwl_cfg iwl8260_2ac_cfg;

extern const struct iwl_cfg iwl8260_n_cfg;

extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;

#endif /* CONFIG_IWLMVM */

#endif /* CONFIG_IWLMVM */





#endif /* __IWL_CONFIG_H__ */
 
#endif /* __IWL_CONFIG_H__ */