Commit 34d59c07 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: use 6000g2b uCode for 130 series devices 



For 130 series device, 6000g2b uCode will be used, no need to
have additional defines for 130 devices, so remove those.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 69d826b6

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

+4 −11
Original line number Diff line number Diff line
@@ -53,13 +53,11 @@ 
#define IWL6000_UCODE_API_MAX 4

#define IWL6050_UCODE_API_MAX 5

#define IWL6000G2_UCODE_API_MAX 5

#define IWL130_UCODE_API_MAX 5



/* Lowest firmware API version supported */

#define IWL6000_UCODE_API_MIN 4

#define IWL6050_UCODE_API_MIN 4

#define IWL6000G2_UCODE_API_MIN 4

#define IWL130_UCODE_API_MIN 5



#define IWL6000_FW_PRE "iwlwifi-6000-"

#define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"
@@ -77,10 +75,6 @@ 
#define _IWL6000G2B_MODULE_FIRMWARE(api) IWL6000G2B_FW_PRE #api ".ucode"

#define IWL6000G2B_MODULE_FIRMWARE(api) _IWL6000G2B_MODULE_FIRMWARE(api)



#define IWL130_FW_PRE "iwlwifi-130-"

#define _IWL130_MODULE_FIRMWARE(api) IWL130_FW_PRE #api ".ucode"

#define IWL130_MODULE_FIRMWARE(api) _IWL130_MODULE_FIRMWARE(api)



static void iwl6000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */
@@ -838,8 +832,8 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
struct iwl_cfg iwl130_bgn_cfg = {

	.name = "Intel(R) 130 Series 1x1 BGN",

	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL130_UCODE_API_MAX,

	.ucode_api_min = IWL130_UCODE_API_MIN,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,
@@ -858,8 +852,8 @@ struct iwl_cfg iwl130_bgn_cfg = { 
struct iwl_cfg iwl130_bg_cfg = {

	.name = "Intel(R) 130 Series 1x2 BG",

	.fw_name_pre = IWL6000G2B_FW_PRE,

	.ucode_api_max = IWL130_UCODE_API_MAX,

	.ucode_api_min = IWL130_UCODE_API_MIN,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,
@@ -878,4 +872,3 @@ MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000G2B_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL130_MODULE_FIRMWARE(IWL130_UCODE_API_MAX));

CRA Git | Maintained and supported by SUSTech CRA and CCSE