aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEyal Shapira <eyal@wizery.com>2013-11-27 19:25:24 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-12-09 15:29:48 -0500
commit809bccfa313e4703b64572986fce6321fb0c039f (patch)
tree7469d463453b9abc6c1e14dcba201d275774ef82 /drivers/net
parenta8ff14f5964a6988fb883ec63de726de2a3bc19e (diff)
iwlwifi: mvm: rs: set dual_stream_ant_msk to ANT_AB always
Drop code which was relevant when there were chips with 3 antennas. Setting to ANT_AB should be ok with all mvm supported chips. Signed-off-by: Eyal Shapira <eyal@wizery.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/rs.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c
index 7beb548fd8dd..5c98d462b7c1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/iwlwifi/mvm/rs.c
@@ -2386,15 +2386,7 @@ void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
2386 /* These values will be overridden later */ 2386 /* These values will be overridden later */
2387 lq_sta->lq.single_stream_ant_msk = 2387 lq_sta->lq.single_stream_ant_msk =
2388 first_antenna(iwl_fw_valid_tx_ant(mvm->fw)); 2388 first_antenna(iwl_fw_valid_tx_ant(mvm->fw));
2389 lq_sta->lq.dual_stream_ant_msk = 2389 lq_sta->lq.dual_stream_ant_msk = ANT_AB;
2390 iwl_fw_valid_tx_ant(mvm->fw) &
2391 ~first_antenna(iwl_fw_valid_tx_ant(mvm->fw));
2392 if (!lq_sta->lq.dual_stream_ant_msk) {
2393 lq_sta->lq.dual_stream_ant_msk = ANT_AB;
2394 } else if (num_of_ant(iwl_fw_valid_tx_ant(mvm->fw)) == 2) {
2395 lq_sta->lq.dual_stream_ant_msk =
2396 iwl_fw_valid_tx_ant(mvm->fw);
2397 }
2398 2390
2399 /* as default allow aggregation for all tids */ 2391 /* as default allow aggregation for all tids */
2400 lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID; 2392 lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;
@@ -2463,8 +2455,6 @@ static void rs_fill_link_cmd(struct iwl_mvm *mvm,
2463 2455
2464 if (num_of_ant(rate.ant) == 1) 2456 if (num_of_ant(rate.ant) == 1)
2465 lq_cmd->single_stream_ant_msk = rate.ant; 2457 lq_cmd->single_stream_ant_msk = rate.ant;
2466 else if (num_of_ant(rate.ant) == 2)
2467 lq_cmd->dual_stream_ant_msk = rate.ant;
2468 /* otherwise we don't modify the existing value */ 2458 /* otherwise we don't modify the existing value */
2469 2459
2470 index++; 2460 index++;