diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c index 37e624095e40..f894bfb43da4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c | |||
@@ -63,23 +63,23 @@ iwl_sta_alloc_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx, u8 sta_id) | |||
63 | if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE) | 63 | if (r >= IWL_FIRST_CCK_RATE && r <= IWL_LAST_CCK_RATE) |
64 | rate_flags |= RATE_MCS_CCK_MSK; | 64 | rate_flags |= RATE_MCS_CCK_MSK; |
65 | 65 | ||
66 | rate_flags |= first_antenna(priv->hw_params.valid_tx_ant) << | 66 | rate_flags |= first_antenna(hw_params(priv).valid_tx_ant) << |
67 | RATE_MCS_ANT_POS; | 67 | RATE_MCS_ANT_POS; |
68 | rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags); | 68 | rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[r].plcp, rate_flags); |
69 | for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) | 69 | for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) |
70 | link_cmd->rs_table[i].rate_n_flags = rate_n_flags; | 70 | link_cmd->rs_table[i].rate_n_flags = rate_n_flags; |
71 | 71 | ||
72 | link_cmd->general_params.single_stream_ant_msk = | 72 | link_cmd->general_params.single_stream_ant_msk = |
73 | first_antenna(priv->hw_params.valid_tx_ant); | 73 | first_antenna(hw_params(priv).valid_tx_ant); |
74 | 74 | ||
75 | link_cmd->general_params.dual_stream_ant_msk = | 75 | link_cmd->general_params.dual_stream_ant_msk = |
76 | priv->hw_params.valid_tx_ant & | 76 | hw_params(priv).valid_tx_ant & |
77 | ~first_antenna(priv->hw_params.valid_tx_ant); | 77 | ~first_antenna(hw_params(priv).valid_tx_ant); |
78 | if (!link_cmd->general_params.dual_stream_ant_msk) { | 78 | if (!link_cmd->general_params.dual_stream_ant_msk) { |
79 | link_cmd->general_params.dual_stream_ant_msk = ANT_AB; | 79 | link_cmd->general_params.dual_stream_ant_msk = ANT_AB; |
80 | } else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) { | 80 | } else if (num_of_ant(hw_params(priv).valid_tx_ant) == 2) { |
81 | link_cmd->general_params.dual_stream_ant_msk = | 81 | link_cmd->general_params.dual_stream_ant_msk = |
82 | priv->hw_params.valid_tx_ant; | 82 | hw_params(priv).valid_tx_ant; |
83 | } | 83 | } |
84 | 84 | ||
85 | link_cmd->agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF; | 85 | link_cmd->agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF; |