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

Commit a0d337f9 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: allow up to uCode API 6 for 6000 devices 



Since the uCode hasn't been released (yet?),
warn only if using older than API 4, but load
anything up to API 6.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 80e83da7

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

+5 −2
Original line number Diff line number Diff line
@@ -46,11 +46,12 @@ 
#include "iwl-cfg.h"



/* Highest firmware API version supported */

#define IWL6000_UCODE_API_MAX 4

#define IWL6000_UCODE_API_MAX 6

#define IWL6050_UCODE_API_MAX 5

#define IWL6000G2_UCODE_API_MAX 6



/* Oldest version we won't warn about */

#define IWL6000_UCODE_API_OK 4

#define IWL6000G2_UCODE_API_OK 5



/* Lowest firmware API version supported */
@@ -457,6 +458,7 @@ struct iwl_cfg iwl130_bg_cfg = { 
#define IWL_DEVICE_6000i					\

	.fw_name_pre = IWL6000_FW_PRE,				\

	.ucode_api_max = IWL6000_UCODE_API_MAX,			\

	.ucode_api_ok = IWL6000_UCODE_API_OK,			\

	.ucode_api_min = IWL6000_UCODE_API_MIN,			\

	.valid_tx_ant = ANT_BC,		/* .cfg overwrite */	\

	.valid_rx_ant = ANT_BC,		/* .cfg overwrite */	\
@@ -535,6 +537,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",

	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_ok = IWL6000_UCODE_API_OK,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
@@ -544,7 +547,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.led_mode = IWL_LED_BLINK,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK));

MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));