diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 32d5f3de429f..bd856df5b04d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -653,10 +653,10 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) | |||
653 | 653 | ||
654 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; | 654 | priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; |
655 | 655 | ||
656 | priv->hw_params.tx_chains_num = 2; | 656 | priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); |
657 | priv->hw_params.rx_chains_num = 2; | 657 | priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant); |
658 | priv->hw_params.valid_tx_ant = ANT_A | ANT_B; | 658 | priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant; |
659 | priv->hw_params.valid_rx_ant = ANT_A | ANT_B; | 659 | priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant; |
660 | if (priv->cfg->ops->lib->temp_ops.set_ct_kill) | 660 | if (priv->cfg->ops->lib->temp_ops.set_ct_kill) |
661 | priv->cfg->ops->lib->temp_ops.set_ct_kill(priv); | 661 | priv->cfg->ops->lib->temp_ops.set_ct_kill(priv); |
662 | 662 | ||
@@ -2225,6 +2225,8 @@ struct iwl_cfg iwl4965_agn_cfg = { | |||
2225 | .num_of_queues = IWL49_NUM_QUEUES, | 2225 | .num_of_queues = IWL49_NUM_QUEUES, |
2226 | .num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES, | 2226 | .num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES, |
2227 | .mod_params = &iwl4965_mod_params, | 2227 | .mod_params = &iwl4965_mod_params, |
2228 | .valid_tx_ant = ANT_AB, | ||
2229 | .valid_rx_ant = ANT_AB, | ||
2228 | .pll_cfg_val = 0, | 2230 | .pll_cfg_val = 0, |
2229 | .set_l0s = true, | 2231 | .set_l0s = true, |
2230 | .use_bsm = true, | 2232 | .use_bsm = true, |