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

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

iwlwifi: specify the valid tx/rx chain in device config structure 



Specify both Tx and Rx chain in device configuration structure instead
of hard code in set_hw_params() for 4965

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 456d0f76

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

+6 −4
Original line number Diff line number Diff line
@@ -653,10 +653,10 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) 


	priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;



	priv->hw_params.tx_chains_num = 2;

	priv->hw_params.rx_chains_num = 2;

	priv->hw_params.valid_tx_ant = ANT_A | ANT_B;

	priv->hw_params.valid_rx_ant = ANT_A | ANT_B;

	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;

	if (priv->cfg->ops->lib->temp_ops.set_ct_kill)

		priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);
@@ -2225,6 +2225,8 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.num_of_queues = IWL49_NUM_QUEUES,

	.num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES,

	.mod_params = &iwl4965_mod_params,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_AB,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = true,