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

Commit 79b6c8fe authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: separate elements from cfg that are needed by trans_alloc 



In order to be able to select the cfg depending on the HW revision or
on the RF ID, we need to set up the trans before selecting the cfg.
To do so, move the elements from cfg that are needed by
iwl_trans_alloc() to a separate struct at the top of the cfg, so it
can be used by other cfg types as well, before selecting the rest of
the configuration.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent cd6de838

drivers/net/wireless/intel/iwlwifi/cfg/1000.c

+7 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -69,16 +69,16 @@ static const struct iwl_eeprom_params iwl1000_eeprom_params = { 
	.fw_name_pre = IWL1000_FW_PRE,				\

	.ucode_api_max = IWL1000_UCODE_API_MAX,			\

	.ucode_api_min = IWL1000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_1000,		\

	.trans.device_family = IWL_DEVICE_FAMILY_1000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.base_params = &iwl1000_base_params,			\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
@@ -95,17 +95,17 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.fw_name_pre = IWL100_FW_PRE,				\

	.ucode_api_max = IWL100_UCODE_API_MAX,			\

	.ucode_api_min = IWL100_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_100,			\

	.trans.device_family = IWL_DEVICE_FAMILY_100,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_1000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.base_params = &iwl1000_base_params,			\

	.trans.base_params = &iwl1000_base_params,		\

	.eeprom_params = &iwl1000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

drivers/net/wireless/intel/iwlwifi/cfg/2000.c

+13 −13
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -95,16 +95,16 @@ static const struct iwl_eeprom_params iwl20x0_eeprom_params = { 
	.fw_name_pre = IWL2000_FW_PRE,				\

	.ucode_api_max = IWL2000_UCODE_API_MAX,			\

	.ucode_api_min = IWL2000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_2000,		\

	.trans.device_family = IWL_DEVICE_FAMILY_2000,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,			\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,		\

	.base_params = &iwl2000_base_params,			\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1





const struct iwl_cfg iwl2000_2bgn_cfg = {
@@ -123,16 +123,16 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.fw_name_pre = IWL2030_FW_PRE,				\

	.ucode_api_max = IWL2030_UCODE_API_MAX,			\

	.ucode_api_min = IWL2030_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_2030,		\

	.trans.device_family = IWL_DEVICE_FAMILY_2030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2030_base_params,			\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
@@ -144,17 +144,17 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.fw_name_pre = IWL105_FW_PRE,				\

	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_105,			\

	.trans.device_family = IWL_DEVICE_FAMILY_105,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2000_base_params,			\

	.trans.base_params = &iwl2000_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
@@ -172,17 +172,17 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.fw_name_pre = IWL135_FW_PRE,				\

	.ucode_api_max = IWL135_UCODE_API_MAX,			\

	.ucode_api_min = IWL135_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_135,			\

	.trans.device_family = IWL_DEVICE_FAMILY_135,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_2000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.base_params = &iwl2030_base_params,			\

	.trans.base_params = &iwl2030_base_params,		\

	.eeprom_params = &iwl20x0_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+17 −17
Original line number Diff line number Diff line
@@ -169,15 +169,15 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.smem_len = IWL_22000_SMEM_LEN,					\

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,		\

	.apmg_not_supported = true,					\

	.mq_rx_supported = true,					\

	.trans.mq_rx_supported = true,					\

	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true,					\

	.ht_params = &iwl_22000_ht_params,				\

	.nvm_ver = IWL_22000_NVM_VERSION,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,		\

	.use_tfh = true,						\

	.rf_id = true,							\

	.gen2 = true,							\

	.trans.use_tfh = true,						\

	.trans.rf_id = true,						\

	.trans.gen2 = true,						\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.min_umac_error_event_table = 0x400000,				\
@@ -190,23 +190,23 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 


#define IWL_DEVICE_22500						\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_22000,			\

	.base_params = &iwl_22000_base_params,				\

	.csr = &iwl_csr_v1,						\

	.trans.device_family = IWL_DEVICE_FAMILY_22000,			\

	.trans.base_params = &iwl_22000_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.gp2_reg_addr = 0xa02c68



#define IWL_DEVICE_22560						\

	IWL_DEVICE_22000_COMMON,					\

	.device_family = IWL_DEVICE_FAMILY_22560,			\

	.base_params = &iwl_22560_base_params,				\

	.csr = &iwl_csr_v2

	.trans.device_family = IWL_DEVICE_FAMILY_22560,			\

	.trans.base_params = &iwl_22560_base_params,			\

	.trans.csr = &iwl_csr_v2



#define IWL_DEVICE_AX210						\

	IWL_DEVICE_22000_COMMON,					\

	.umac_prph_offset = 0x300000,					\

	.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.base_params = &iwl_22560_base_params,				\

	.csr = &iwl_csr_v1,						\

	.trans.umac_prph_offset = 0x300000,				\

	.trans.device_family = IWL_DEVICE_FAMILY_AX210,			\

	.trans.base_params = &iwl_22560_base_params,			\

	.trans.csr = &iwl_csr_v1,					\

	.min_txq_size = 128,						\

	.gp2_reg_addr = 0xd02c68,					\

	.min_256_ba_txq_size = 512
@@ -336,7 +336,7 @@ const struct iwl_cfg iwl_ax200_cfg_cc = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

	.trans.bisr_workaround = 1,

};



const struct iwl_cfg killer1650x_2ax_cfg = {
@@ -349,7 +349,7 @@ const struct iwl_cfg killer1650x_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

	.trans.bisr_workaround = 1,

};



const struct iwl_cfg killer1650w_2ax_cfg = {
@@ -362,7 +362,7 @@ const struct iwl_cfg killer1650w_2ax_cfg = { 
	 * HT size; mac80211 would otherwise pick the HE max (256) by default.

	 */

	.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,

	.bisr_workaround = 1,

	.trans.bisr_workaround = 1,

};



/*

drivers/net/wireless/intel/iwlwifi/cfg/5000.c

+9 −9
Original line number Diff line number Diff line
@@ -67,16 +67,16 @@ static const struct iwl_eeprom_params iwl5000_eeprom_params = { 
	.fw_name_pre = IWL5000_FW_PRE,				\

	.ucode_api_max = IWL5000_UCODE_API_MAX,			\

	.ucode_api_min = IWL5000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_5000,		\

	.trans.device_family = IWL_DEVICE_FAMILY_5000,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_5000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.base_params = &iwl5000_base_params,			\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",
@@ -115,34 +115,34 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.device_family = IWL_DEVICE_FAMILY_5000,

	.trans.device_family = IWL_DEVICE_FAMILY_5000,

	.max_inst_size = IWLAGN_RTC_INST_SIZE,

	.max_data_size = IWLAGN_RTC_DATA_SIZE,

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.base_params = &iwl5000_base_params,

	.trans.base_params = &iwl5000_base_params,

	.eeprom_params = &iwl5000_eeprom_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.internal_wimax_coex = true,

	.csr = &iwl_csr_v1,

	.trans.csr = &iwl_csr_v1,

};



#define IWL_DEVICE_5150						\

	.fw_name_pre = IWL5150_FW_PRE,				\

	.ucode_api_max = IWL5150_UCODE_API_MAX,			\

	.ucode_api_min = IWL5150_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_5150,		\

	.trans.device_family = IWL_DEVICE_FAMILY_5150,		\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_5050_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\

	.base_params = &iwl5000_base_params,			\

	.trans.base_params = &iwl5000_base_params,		\

	.eeprom_params = &iwl5000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",

drivers/net/wireless/intel/iwlwifi/cfg/6000.c

+22 −22
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/******************************************************************************

 *

 * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2018 Intel Corporation

 * Copyright(c) 2018 - 2019 Intel Corporation

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>
@@ -116,16 +116,16 @@ static const struct iwl_eeprom_params iwl6000_eeprom_params = { 
	.fw_name_pre = IWL6005_FW_PRE,				\

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\

	.device_family = IWL_DEVICE_FAMILY_6005,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6005,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6005_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\

	.base_params = &iwl6000_g2_base_params,			\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl6005_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",
@@ -171,16 +171,16 @@ const struct iwl_cfg iwl6005_2agn_mow2_cfg = { 
	.fw_name_pre = IWL6030_FW_PRE,				\

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\

	.device_family = IWL_DEVICE_FAMILY_6030,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.base_params = &iwl6000_g2_base_params,			\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl6030_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
@@ -208,16 +208,16 @@ const struct iwl_cfg iwl6030_2bg_cfg = { 
	.fw_name_pre = IWL6030_FW_PRE,				\

	.ucode_api_max = IWL6035_UCODE_API_MAX,			\

	.ucode_api_min = IWL6035_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_6030,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6030,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6030_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.base_params = &iwl6000_g2_base_params,			\

	.trans.base_params = &iwl6000_g2_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_RF_STATE,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",
@@ -262,18 +262,18 @@ const struct iwl_cfg iwl130_bg_cfg = { 
	.fw_name_pre = IWL6000_FW_PRE,				\

	.ucode_api_max = IWL6000_UCODE_API_MAX,			\

	.ucode_api_min = IWL6000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_6000i,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6000i,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

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

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

	.nvm_ver = EEPROM_6000_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,	\

	.base_params = &iwl6000_base_params,			\

	.trans.base_params = &iwl6000_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl6000i_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",
@@ -295,19 +295,19 @@ const struct iwl_cfg iwl6000i_2bg_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_6050,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6050,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

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

	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */	\

	.nvm_ver = EEPROM_6050_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6050_TX_POWER_VERSION,	\

	.base_params = &iwl6050_base_params,			\

	.trans.base_params = &iwl6050_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl6050_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
@@ -324,17 +324,17 @@ const struct iwl_cfg iwl6050_2abg_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_6150,		\

	.trans.device_family = IWL_DEVICE_FAMILY_6150,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.nvm_ver = EEPROM_6150_EEPROM_VERSION,		\

	.nvm_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\

	.base_params = &iwl6050_base_params,			\

	.trans.base_params = &iwl6050_base_params,		\

	.eeprom_params = &iwl6000_eeprom_params,		\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true,				\

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,	\

	.csr = &iwl_csr_v1

	.trans.csr = &iwl_csr_v1



const struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",
@@ -352,16 +352,16 @@ const struct iwl_cfg iwl6000_3agn_cfg = { 
	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.device_family = IWL_DEVICE_FAMILY_6000,

	.trans.device_family = IWL_DEVICE_FAMILY_6000,

	.max_inst_size = IWL60_RTC_INST_SIZE,

	.max_data_size = IWL60_RTC_DATA_SIZE,

	.nvm_ver = EEPROM_6000_EEPROM_VERSION,

	.nvm_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.base_params = &iwl6000_base_params,

	.trans.base_params = &iwl6000_base_params,

	.eeprom_params = &iwl6000_eeprom_params,

	.ht_params = &iwl6000_ht_params,

	.led_mode = IWL_LED_BLINK,

	.csr = &iwl_csr_v1,

	.trans.csr = &iwl_csr_v1,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));