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

Commit edbe4073 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents 7573eac7 cf9768d6

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -563,3 +563,13 @@ Why: superseded by acpi_sleep=nonvs 
Who:	Rafael J. Wysocki <rjw@sisk.pl>



----------------------------



What:	iwlwifi disable_hw_scan module parameters

When:	2.6.40

Why:	Hareware scan is the prefer method for iwlwifi devices for

	scanning operation. Remove software scan support for all the

	iwlwifi devices.



Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>



----------------------------

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

+38 −83
Original line number Diff line number Diff line
@@ -126,13 +126,13 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->num_of_queues =

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->num_of_queues;

	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->num_of_queues *

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwlagn_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
@@ -250,29 +250,16 @@ static const struct iwl_ops iwl1000_ops = { 
	.led = &iwlagn_led_ops,

};



struct iwl_cfg iwl1000_bgn_cfg = {

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

	.fw_name_pre = IWL1000_FW_PRE,

	.ucode_api_max = IWL1000_UCODE_API_MAX,

	.ucode_api_min = IWL1000_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

static struct iwl_base_params iwl1000_base_params = {

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,
@@ -283,6 +270,26 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};

static struct iwl_ht_params iwl1000_ht_params = {

	.ht_greenfield_support = true,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

};



struct iwl_cfg iwl1000_bgn_cfg = {

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

	.fw_name_pre = IWL1000_FW_PRE,

	.ucode_api_max = IWL1000_UCODE_API_MAX,

	.ucode_api_min = IWL1000_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl1000_base_params,

	.ht_params = &iwl1000_ht_params,

};



struct iwl_cfg iwl1000_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BG",
@@ -290,30 +297,13 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.ucode_api_max = IWL1000_UCODE_API_MAX,

	.ucode_api_min = IWL1000_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl1000_base_params,

};



struct iwl_cfg iwl100_bgn_cfg = {
@@ -322,32 +312,14 @@ struct iwl_cfg iwl100_bgn_cfg = { 
	.ucode_api_max = IWL100_UCODE_API_MAX,

	.ucode_api_min = IWL100_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl1000_base_params,

	.ht_params = &iwl1000_ht_params,

};



struct iwl_cfg iwl100_bg_cfg = {
@@ -356,30 +328,13 @@ struct iwl_cfg iwl100_bg_cfg = { 
	.ucode_api_max = IWL100_UCODE_API_MAX,

	.ucode_api_min = IWL100_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl1000_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl1000_base_params,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

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

+18 −25
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static bool iwl3945_good_plcp_health(struct iwl_priv *priv, 
	unsigned int plcp_msec;

	unsigned long plcp_received_jiffies;



	if (priv->cfg->plcp_delta_threshold ==

	if (priv->cfg->base_params->plcp_delta_threshold ==

	    IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {

		IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");

		return rc;
@@ -432,7 +432,7 @@ static bool iwl3945_good_plcp_health(struct iwl_priv *priv, 


		if ((combined_plcp_delta > 0) &&

			((combined_plcp_delta * 100) / plcp_msec) >

			priv->cfg->plcp_delta_threshold) {

			priv->cfg->base_params->plcp_delta_threshold) {

			/*

			 * if plcp_err exceed the threshold, the following

			 * data is printed in csv format:
@@ -444,7 +444,7 @@ static bool iwl3945_good_plcp_health(struct iwl_priv *priv, 
			 */

			IWL_DEBUG_RADIO(priv, "plcp_err exceeded %u, "

				"%u, %d, %u mSecs\n",

				priv->cfg->plcp_delta_threshold,

				priv->cfg->base_params->plcp_delta_threshold,

				le32_to_cpu(current_stat.rx.ofdm.plcp_err),

				combined_plcp_delta, plcp_msec);

			/*
@@ -2421,7 +2421,7 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv) 
	}



	/* Assign number of Usable TX queues */

	priv->hw_params.max_txq_num = priv->cfg->num_of_queues;

	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;



	priv->hw_params.tfd_size = sizeof(struct iwl3945_tfd);

	priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_3K);
@@ -2722,22 +2722,12 @@ static const struct iwl_ops iwl3945_ops = { 
	.led = &iwl3945_led_ops,

};



static struct iwl_cfg iwl3945_bg_cfg = {

	.name = "3945BG",

	.fw_name_pre = IWL3945_FW_PRE,

	.ucode_api_max = IWL3945_UCODE_API_MAX,

	.ucode_api_min = IWL3945_UCODE_API_MIN,

	.sku = IWL_SKU_G,

static struct iwl_base_params iwl3945_base_params = {

	.eeprom_size = IWL3945_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_3945_EEPROM_VERSION,

	.ops = &iwl3945_ops,

	.num_of_queues = IWL39_NUM_QUEUES,

	.mod_params = &iwl3945_mod_params,

	.pll_cfg_val = CSR39_ANA_PLL_CFG_VAL,

	.set_l0s = false,

	.use_bsm = true,

	.use_isr_legacy = true,

	.ht_greenfield_support = false,

	.led_compensation = 64,

	.broken_powersave = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
@@ -2746,25 +2736,28 @@ static struct iwl_cfg iwl3945_bg_cfg = { 
	.tx_power_by_driver = true,

};



static struct iwl_cfg iwl3945_bg_cfg = {

	.name = "3945BG",

	.fw_name_pre = IWL3945_FW_PRE,

	.ucode_api_max = IWL3945_UCODE_API_MAX,

	.ucode_api_min = IWL3945_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.eeprom_ver = EEPROM_3945_EEPROM_VERSION,

	.ops = &iwl3945_ops,

	.mod_params = &iwl3945_mod_params,

	.base_params = &iwl3945_base_params,

};



static struct iwl_cfg iwl3945_abg_cfg = {

	.name = "3945ABG",

	.fw_name_pre = IWL3945_FW_PRE,

	.ucode_api_max = IWL3945_UCODE_API_MAX,

	.ucode_api_min = IWL3945_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.eeprom_size = IWL3945_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_3945_EEPROM_VERSION,

	.ops = &iwl3945_ops,

	.num_of_queues = IWL39_NUM_QUEUES,

	.mod_params = &iwl3945_mod_params,

	.use_isr_legacy = true,

	.ht_greenfield_support = false,

	.led_compensation = 64,

	.broken_powersave = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.tx_power_by_driver = true,

	.base_params = &iwl3945_base_params,

};



DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {

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

+25 −22
Original line number Diff line number Diff line
@@ -647,13 +647,13 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) 
{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWL49_NUM_QUEUES)

		priv->cfg->num_of_queues =

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->num_of_queues;

	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH49_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->num_of_queues *

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwl4965_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWL4965_STATION_COUNT;
@@ -1724,13 +1724,13 @@ static int iwl4965_txq_agg_disable(struct iwl_priv *priv, u16 txq_id, 
				   u16 ssn_idx, u8 tx_fifo)

{

	if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL49_FIRST_AMPDU_QUEUE + priv->cfg->num_of_ampdu_queues

	     <= txq_id)) {

	    (IWL49_FIRST_AMPDU_QUEUE +

		priv->cfg->base_params->num_of_ampdu_queues <= txq_id)) {

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL49_FIRST_AMPDU_QUEUE,

			IWL49_FIRST_AMPDU_QUEUE +

			priv->cfg->num_of_ampdu_queues - 1);

			priv->cfg->base_params->num_of_ampdu_queues - 1);

		return -EINVAL;

	}
@@ -1792,13 +1792,13 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id, 
	int ret;



	if ((IWL49_FIRST_AMPDU_QUEUE > txq_id) ||

	    (IWL49_FIRST_AMPDU_QUEUE + priv->cfg->num_of_ampdu_queues

	     <= txq_id)) {

	    (IWL49_FIRST_AMPDU_QUEUE +

		priv->cfg->base_params->num_of_ampdu_queues <= txq_id)) {

		IWL_WARN(priv,

			"queue number out of range: %d, must be %d to %d\n",

			txq_id, IWL49_FIRST_AMPDU_QUEUE,

			IWL49_FIRST_AMPDU_QUEUE +

			priv->cfg->num_of_ampdu_queues - 1);

			priv->cfg->base_params->num_of_ampdu_queues - 1);

		return -EINVAL;

	}
@@ -2302,26 +2302,14 @@ static const struct iwl_ops iwl4965_ops = { 
	.led = &iwlagn_led_ops,

};



struct iwl_cfg iwl4965_agn_cfg = {

	.name = "Intel(R) Wireless WiFi Link 4965AGN",

	.fw_name_pre = IWL4965_FW_PRE,

	.ucode_api_max = IWL4965_UCODE_API_MAX,

	.ucode_api_min = IWL4965_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

static struct iwl_base_params iwl4965_base_params = {

	.eeprom_size = IWL4965_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_4965_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,

	.ops = &iwl4965_ops,

	.num_of_queues = IWL49_NUM_QUEUES,

	.num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_ABC,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = true,

	.use_isr_legacy = true,

	.ht_greenfield_support = false,

	.broken_powersave = true,

	.led_compensation = 61,

	.chain_noise_num_beacons = IWL4965_CAL_NUM_BEACONS,
@@ -2333,6 +2321,21 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl4965_agn_cfg = {

	.name = "Intel(R) Wireless WiFi Link 4965AGN",

	.fw_name_pre = IWL4965_FW_PRE,

	.ucode_api_max = IWL4965_UCODE_API_MAX,

	.ucode_api_min = IWL4965_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_ABC,

	.eeprom_ver = EEPROM_4965_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_4965_TX_POWER_VERSION,

	.ops = &iwl4965_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl4965_base_params,

	/*

	 * Force use of chains B and C for scan RX on 5 GHz band

	 * because the device has off-channel reception on chain A.

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

+55 −136
Original line number Diff line number Diff line
@@ -170,13 +170,13 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->num_of_queues =

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->num_of_queues;

	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->num_of_queues *

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwlagn_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
@@ -217,13 +217,13 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
{

	if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)

		priv->cfg->num_of_queues =

		priv->cfg->base_params->num_of_queues =

			priv->cfg->mod_params->num_of_queues;



	priv->hw_params.max_txq_num = priv->cfg->num_of_queues;

	priv->hw_params.max_txq_num = priv->cfg->base_params->num_of_queues;

	priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;

	priv->hw_params.scd_bc_tbls_size =

			priv->cfg->num_of_queues *

			priv->cfg->base_params->num_of_queues *

			sizeof(struct iwlagn_scd_bc_tbl);

	priv->hw_params.tfd_size = sizeof(struct iwl_tfd);

	priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
@@ -504,27 +504,14 @@ static const struct iwl_ops iwl5150_ops = { 
	.led = &iwlagn_led_ops,

};



struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",

	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

static struct iwl_base_params iwl5000_base_params = {

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,
@@ -534,6 +521,26 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};

static struct iwl_ht_params iwl5000_ht_params = {

	.ht_greenfield_support = true,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

};



struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",

	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

};



struct iwl_cfg iwl5100_bgn_cfg = {

	.name = "Intel(R) WiFi Link 5100 BGN",
@@ -541,29 +548,14 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

};



struct iwl_cfg iwl5100_abg_cfg = {
@@ -572,27 +564,13 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl5000_ops,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl5000_base_params,

};



struct iwl_cfg iwl5100_agn_cfg = {
@@ -601,29 +579,14 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_B,

	.valid_rx_ant = ANT_AB,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

};



struct iwl_cfg iwl5350_agn_cfg = {
@@ -632,29 +595,14 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl5000_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_ABC,

	.valid_rx_ant = ANT_ABC,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

};



struct iwl_cfg iwl5150_agn_cfg = {
@@ -663,29 +611,14 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.ucode_api_max = IWL5150_UCODE_API_MAX,

	.ucode_api_min = IWL5150_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5150_ops,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl5150_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.need_dc_calib = true,

};
@@ -695,27 +628,13 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.ucode_api_max = IWL5150_UCODE_API_MAX,

	.ucode_api_min = IWL5150_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl5150_ops,

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.ops = &iwl5150_ops,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_AB,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	.base_params = &iwl5000_base_params,

	.need_dc_calib = true,

};