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

Commit d6189124 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: hw_params moves to iwl_shared 



Since it is used by all the layers, it needs to move to iwl_shared.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@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 8f470ce3

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

+18 −18
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
static void iwl1000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */

	priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;

	priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

	hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;

	hw_params(priv).ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

}



/* NIC configuration for 1000 series */
@@ -128,43 +128,43 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
		priv->cfg->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



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

	priv->hw_params.scd_bc_tbls_size =

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

	hw_params(priv).scd_bc_tbls_size =

			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;

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

	hw_params(priv).max_stations = IWLAGN_STATION_COUNT;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;

	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;



	priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);

	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);



	priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	hw_params(priv).tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	if (priv->cfg->rx_with_siso_diversity)

		priv->hw_params.rx_chains_num = 1;

		hw_params(priv).rx_chains_num = 1;

	else

		priv->hw_params.rx_chains_num =

		hw_params(priv).rx_chains_num =

			num_of_ant(priv->cfg->valid_rx_ant);

	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;

	hw_params(priv).valid_tx_ant = priv->cfg->valid_tx_ant;

	hw_params(priv).valid_rx_ant = priv->cfg->valid_rx_ant;



	iwl1000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */

	priv->hw_params.sens = &iwl1000_sensitivity;

	priv->hw_params.calib_init_cfg =

	hw_params(priv).sens = &iwl1000_sensitivity;

	hw_params(priv).calib_init_cfg =

			BIT(IWL_CALIB_XTAL)		|

			BIT(IWL_CALIB_LO)		|

			BIT(IWL_CALIB_TX_IQ) 		|

			BIT(IWL_CALIB_TX_IQ_PERD)	|

			BIT(IWL_CALIB_BASE_BAND);

	if (priv->cfg->need_dc_calib)

		priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);

		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);



	priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;

	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}

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

+19 −19
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ 
static void iwl2000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */

	priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;

	priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

	hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD;

	hw_params(priv).ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

}



/* NIC configuration for 2000 series */
@@ -125,44 +125,44 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) 
		priv->cfg->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



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

	priv->hw_params.scd_bc_tbls_size =

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

	hw_params(priv).scd_bc_tbls_size =

		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;

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

	hw_params(priv).max_stations = IWLAGN_STATION_COUNT;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;

	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWL60_RTC_INST_SIZE;



	priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);

	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);



	priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	hw_params(priv).tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	if (priv->cfg->rx_with_siso_diversity)

		priv->hw_params.rx_chains_num = 1;

		hw_params(priv).rx_chains_num = 1;

	else

		priv->hw_params.rx_chains_num =

		hw_params(priv).rx_chains_num =

			num_of_ant(priv->cfg->valid_rx_ant);

	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;

	hw_params(priv).valid_tx_ant = priv->cfg->valid_tx_ant;

	hw_params(priv).valid_rx_ant = priv->cfg->valid_rx_ant;



	iwl2000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */

	priv->hw_params.sens = &iwl2000_sensitivity;

	priv->hw_params.calib_init_cfg =

	hw_params(priv).sens = &iwl2000_sensitivity;

	hw_params(priv).calib_init_cfg =

		BIT(IWL_CALIB_XTAL)             |

		BIT(IWL_CALIB_LO)               |

		BIT(IWL_CALIB_TX_IQ)            |

		BIT(IWL_CALIB_BASE_BAND);

	if (priv->cfg->need_dc_calib)

		priv->hw_params.calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;

		hw_params(priv).calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;

	if (priv->cfg->need_temp_offset_calib)

		priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);

		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);



	priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;

	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}

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

+31 −31
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ static void iwl5150_set_ct_threshold(struct iwl_priv *priv) 
	s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -

			iwl_temp_calib_to_offset(priv);



	priv->hw_params.ct_kill_threshold = threshold * volt2temp_coef;

	hw_params(priv).ct_kill_threshold = threshold * volt2temp_coef;

}



static void iwl5000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */

	priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;

	hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;

}



static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
@@ -156,38 +156,38 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
		priv->cfg->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



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

	priv->hw_params.scd_bc_tbls_size =

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

	hw_params(priv).scd_bc_tbls_size =

			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;

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

	hw_params(priv).max_stations = IWLAGN_STATION_COUNT;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;

	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;



	priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);



	priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);

	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;

	hw_params(priv).tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	hw_params(priv).rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);

	hw_params(priv).valid_tx_ant = priv->cfg->valid_tx_ant;

	hw_params(priv).valid_rx_ant = priv->cfg->valid_rx_ant;



	iwl5000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */

	priv->hw_params.sens = &iwl5000_sensitivity;

	priv->hw_params.calib_init_cfg =

	hw_params(priv).sens = &iwl5000_sensitivity;

	hw_params(priv).calib_init_cfg =

		BIT(IWL_CALIB_XTAL)		|

		BIT(IWL_CALIB_LO)		|

		BIT(IWL_CALIB_TX_IQ)		|

		BIT(IWL_CALIB_TX_IQ_PERD)	|

		BIT(IWL_CALIB_BASE_BAND);



	priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;

	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}
@@ -199,38 +199,38 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
		priv->cfg->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



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

	priv->hw_params.scd_bc_tbls_size =

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

	hw_params(priv).scd_bc_tbls_size =

			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;

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

	hw_params(priv).max_stations = IWLAGN_STATION_COUNT;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWLAGN_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWLAGN_RTC_INST_SIZE;

	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;



	priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);



	priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);

	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;

	hw_params(priv).tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	hw_params(priv).rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);

	hw_params(priv).valid_tx_ant = priv->cfg->valid_tx_ant;

	hw_params(priv).valid_rx_ant = priv->cfg->valid_rx_ant;



	iwl5150_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */

	priv->hw_params.sens = &iwl5150_sensitivity;

	priv->hw_params.calib_init_cfg =

	hw_params(priv).sens = &iwl5150_sensitivity;

	hw_params(priv).calib_init_cfg =

		BIT(IWL_CALIB_LO)		|

		BIT(IWL_CALIB_TX_IQ)		|

		BIT(IWL_CALIB_BASE_BAND);

	if (priv->cfg->need_dc_calib)

		priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);

		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);



	priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;

	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}

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

+19 −19
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 
static void iwl6000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */

	priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;

	priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

	hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD;

	hw_params(priv).ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

}



static void iwl6050_additional_nic_config(struct iwl_priv *priv)
@@ -145,45 +145,45 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
		priv->cfg->base_params->num_of_queues =

			iwlagn_mod_params.num_of_queues;



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

	priv->hw_params.scd_bc_tbls_size =

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

	hw_params(priv).scd_bc_tbls_size =

			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;

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

	hw_params(priv).max_stations = IWLAGN_STATION_COUNT;

	priv->contexts[IWL_RXON_CTX_BSS].bcast_sta_id = IWLAGN_BROADCAST_ID;



	priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;

	priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;

	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWL60_RTC_INST_SIZE;



	priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);



	priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	hw_params(priv).tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);

	if (priv->cfg->rx_with_siso_diversity)

		priv->hw_params.rx_chains_num = 1;

		hw_params(priv).rx_chains_num = 1;

	else

		priv->hw_params.rx_chains_num =

		hw_params(priv).rx_chains_num =

			num_of_ant(priv->cfg->valid_rx_ant);

	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;

	hw_params(priv).valid_tx_ant = priv->cfg->valid_tx_ant;

	hw_params(priv).valid_rx_ant = priv->cfg->valid_rx_ant;



	iwl6000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */

	priv->hw_params.sens = &iwl6000_sensitivity;

	priv->hw_params.calib_init_cfg =

	hw_params(priv).sens = &iwl6000_sensitivity;

	hw_params(priv).calib_init_cfg =

		BIT(IWL_CALIB_XTAL)		|

		BIT(IWL_CALIB_LO)		|

		BIT(IWL_CALIB_TX_IQ)		|

		BIT(IWL_CALIB_BASE_BAND);

	if (priv->cfg->need_dc_calib)

		priv->hw_params.calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;

		hw_params(priv).calib_rt_cfg |= IWL_CALIB_CFG_DC_IDX;

	if (priv->cfg->need_temp_offset_calib)

		priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);

		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);



	priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;

	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}

drivers/net/wireless/iwlwifi/iwl-agn-calib.c

+11 −10
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int iwl_send_calib_results(struct iwl_priv *priv) 
	};



	for (i = 0; i < IWL_CALIB_MAX; i++) {

		if ((BIT(i) & priv->hw_params.calib_init_cfg) &&

		if ((BIT(i) & hw_params(priv).calib_init_cfg) &&

		    priv->calib_results[i].buf) {

			hcmd.len[0] = priv->calib_results[i].buf_len;

			hcmd.data[0] = priv->calib_results[i].buf;
@@ -174,7 +174,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv, 
	u32 max_false_alarms = MAX_FA_CCK * rx_enable_time;

	u32 min_false_alarms = MIN_FA_CCK * rx_enable_time;

	struct iwl_sensitivity_data *data = NULL;

	const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;

	const struct iwl_sensitivity_ranges *ranges = hw_params(priv).sens;



	data = &(priv->sensitivity_data);
@@ -357,7 +357,7 @@ static int iwl_sens_auto_corr_ofdm(struct iwl_priv *priv, 
	u32 max_false_alarms = MAX_FA_OFDM * rx_enable_time;

	u32 min_false_alarms = MIN_FA_OFDM * rx_enable_time;

	struct iwl_sensitivity_data *data = NULL;

	const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;

	const struct iwl_sensitivity_ranges *ranges = hw_params(priv).sens;



	data = &(priv->sensitivity_data);
@@ -581,7 +581,7 @@ void iwl_init_sensitivity(struct iwl_priv *priv) 
	int ret = 0;

	int i;

	struct iwl_sensitivity_data *data = NULL;

	const struct iwl_sensitivity_ranges *ranges = priv->hw_params.sens;

	const struct iwl_sensitivity_ranges *ranges = hw_params(priv).sens;



	if (priv->disable_sens_cal)

		return;
@@ -821,21 +821,21 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig, 
	 * To be safe, simply mask out any chains that we know

	 * are not on the device.

	 */

	active_chains &= priv->hw_params.valid_rx_ant;

	active_chains &= hw_params(priv).valid_rx_ant;



	num_tx_chains = 0;

	for (i = 0; i < NUM_RX_CHAINS; i++) {

		/* loops on all the bits of

		 * priv->hw_setting.valid_tx_ant */

		u8 ant_msk = (1 << i);

		if (!(priv->hw_params.valid_tx_ant & ant_msk))

		if (!(hw_params(priv).valid_tx_ant & ant_msk))

			continue;



		num_tx_chains++;

		if (data->disconn_array[i] == 0)

			/* there is a Tx antenna connected */

			break;

		if (num_tx_chains == priv->hw_params.tx_chains_num &&

		if (num_tx_chains == hw_params(priv).tx_chains_num &&

		    data->disconn_array[i]) {

			/*

			 * If all chains are disconnected
@@ -852,12 +852,13 @@ static void iwl_find_disconn_antenna(struct iwl_priv *priv, u32* average_sig, 
		}

	}



	if (active_chains != priv->hw_params.valid_rx_ant &&

	if (active_chains != hw_params(priv).valid_rx_ant &&

	    active_chains != priv->chain_noise_data.active_chains)

		IWL_DEBUG_CALIB(priv,

				"Detected that not all antennas are connected! "

				"Connected: %#x, valid: %#x.\n",

				active_chains, priv->hw_params.valid_rx_ant);

				active_chains,

				hw_params(priv).valid_rx_ant);



	/* Save for use within RXON, TX, SCAN commands, etc. */

	data->active_chains = active_chains;
@@ -1046,7 +1047,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv) 
	    priv->cfg->bt_params->advanced_bt_coexist) {

		/* Disable disconnected antenna algorithm for advanced

		   bt coex, assuming valid antennas are connected */

		data->active_chains = priv->hw_params.valid_rx_ant;

		data->active_chains = hw_params(priv).valid_rx_ant;

		for (i = 0; i < NUM_RX_CHAINS; i++)

			if (!(data->active_chains & (1<<i)))

				data->disconn_array[i] = 1;