Commit eb48dcaf authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville

iwlwifi: iwl-agn-rs: initialize rs with valid antenna

This patch fix rate scaling initialization. Rate scaling
was initialized always with B antenna.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6a63578d
...@@ -2071,15 +2071,13 @@ static void rs_initialize_lq(struct iwl_priv *priv, ...@@ -2071,15 +2071,13 @@ static void rs_initialize_lq(struct iwl_priv *priv,
if ((i < 0) || (i >= IWL_RATE_COUNT)) if ((i < 0) || (i >= IWL_RATE_COUNT))
i = 0; i = 0;
/* FIXME:RS: This is also wrong in 4965 */
rate = iwl_rates[i].plcp; rate = iwl_rates[i].plcp;
rate |= RATE_MCS_ANT_B_MSK; tbl->ant_type = first_antenna(valid_tx_ant);
rate &= ~RATE_MCS_ANT_A_MSK; rate |= tbl->ant_type << RATE_MCS_ANT_POS;
if (i >= IWL_FIRST_CCK_RATE && i <= IWL_LAST_CCK_RATE) if (i >= IWL_FIRST_CCK_RATE && i <= IWL_LAST_CCK_RATE)
rate |= RATE_MCS_CCK_MSK; rate |= RATE_MCS_CCK_MSK;
tbl->ant_type = ANT_B;
rs_get_tbl_info_from_mcs(rate, priv->band, tbl, &rate_idx); rs_get_tbl_info_from_mcs(rate, priv->band, tbl, &rate_idx);
if (!rs_is_valid_ant(valid_tx_ant, tbl->ant_type)) if (!rs_is_valid_ant(valid_tx_ant, tbl->ant_type))
rs_toggle_antenna(valid_tx_ant, &rate, tbl); rs_toggle_antenna(valid_tx_ant, &rate, tbl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment