aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index f5e94b65a7f6..0332805cc630 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -2071,15 +2071,13 @@ static void rs_initialize_lq(struct iwl_priv *priv,
2071 if ((i < 0) || (i >= IWL_RATE_COUNT)) 2071 if ((i < 0) || (i >= IWL_RATE_COUNT))
2072 i = 0; 2072 i = 0;
2073 2073
2074 /* FIXME:RS: This is also wrong in 4965 */
2075 rate = iwl_rates[i].plcp; 2074 rate = iwl_rates[i].plcp;
2076 rate |= RATE_MCS_ANT_B_MSK; 2075 tbl->ant_type = first_antenna(valid_tx_ant);
2077 rate &= ~RATE_MCS_ANT_A_MSK; 2076 rate |= tbl->ant_type << RATE_MCS_ANT_POS;
2078 2077
2079 if (i >= IWL_FIRST_CCK_RATE && i <= IWL_LAST_CCK_RATE) 2078 if (i >= IWL_FIRST_CCK_RATE && i <= IWL_LAST_CCK_RATE)
2080 rate |= RATE_MCS_CCK_MSK; 2079 rate |= RATE_MCS_CCK_MSK;
2081 2080
2082 tbl->ant_type = ANT_B;
2083 rs_get_tbl_info_from_mcs(rate, priv->band, tbl, &rate_idx); 2081 rs_get_tbl_info_from_mcs(rate, priv->band, tbl, &rate_idx);
2084 if (!rs_is_valid_ant(valid_tx_ant, tbl->ant_type)) 2082 if (!rs_is_valid_ant(valid_tx_ant, tbl->ant_type))
2085 rs_toggle_antenna(valid_tx_ant, &rate, tbl); 2083 rs_toggle_antenna(valid_tx_ant, &rate, tbl);