diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/sta.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c index cd9b6de4273e..bdba9543c351 100644 --- a/drivers/net/wireless/iwlwifi/dvm/sta.c +++ b/drivers/net/wireless/iwlwifi/dvm/sta.c | |||
@@ -634,23 +634,23 @@ static void iwl_sta_fill_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | |||
634 | if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE) | 634 | if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE) |
635 | rate_flags |= RATE_MCS_CCK_MSK; | 635 | rate_flags |= RATE_MCS_CCK_MSK; |
636 | 636 | ||
637 | rate_flags |= first_antenna(priv->eeprom_data->valid_tx_ant) << | 637 | rate_flags |= first_antenna(priv->nvm_data->valid_tx_ant) << |
638 | RATE_MCS_ANT_POS; | 638 | RATE_MCS_ANT_POS; |
639 | rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags); | 639 | rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags); |
640 | for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) | 640 | for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) |
641 | link_cmd->rs_table[i].rate_n_flags = rate_n_flags; | 641 | link_cmd->rs_table[i].rate_n_flags = rate_n_flags; |
642 | 642 | ||
643 | link_cmd->general_params.single_stream_ant_msk = | 643 | link_cmd->general_params.single_stream_ant_msk = |
644 | first_antenna(priv->eeprom_data->valid_tx_ant); | 644 | first_antenna(priv->nvm_data->valid_tx_ant); |
645 | 645 | ||
646 | link_cmd->general_params.dual_stream_ant_msk = | 646 | link_cmd->general_params.dual_stream_ant_msk = |
647 | priv->eeprom_data->valid_tx_ant & | 647 | priv->nvm_data->valid_tx_ant & |
648 | ~first_antenna(priv->eeprom_data->valid_tx_ant); | 648 | ~first_antenna(priv->nvm_data->valid_tx_ant); |
649 | if (!link_cmd->general_params.dual_stream_ant_msk) { | 649 | if (!link_cmd->general_params.dual_stream_ant_msk) { |
650 | link_cmd->general_params.dual_stream_ant_msk = ANT_AB; | 650 | link_cmd->general_params.dual_stream_ant_msk = ANT_AB; |
651 | } else if (num_of_ant(priv->eeprom_data->valid_tx_ant) == 2) { | 651 | } else if (num_of_ant(priv->nvm_data->valid_tx_ant) == 2) { |
652 | link_cmd->general_params.dual_stream_ant_msk = | 652 | link_cmd->general_params.dual_stream_ant_msk = |
653 | priv->eeprom_data->valid_tx_ant; | 653 | priv->nvm_data->valid_tx_ant; |
654 | } | 654 | } |
655 | 655 | ||
656 | link_cmd->agg_params.agg_dis_start_th = | 656 | link_cmd->agg_params.agg_dis_start_th = |