Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 809bccfa authored by Eyal Shapira's avatar Eyal Shapira Committed by Emmanuel Grumbach
Browse files

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: default avatarEyal Shapira <eyal@wizery.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent a8ff14f5

drivers/net/wireless/iwlwifi/mvm/rs.c

+1 −11
Original line number Diff line number Diff line
@@ -2386,15 +2386,7 @@ void iwl_mvm_rs_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	/* These values will be overridden later */

	lq_sta->lq.single_stream_ant_msk =

		first_antenna(iwl_fw_valid_tx_ant(mvm->fw));

	lq_sta->lq.dual_stream_ant_msk =

		iwl_fw_valid_tx_ant(mvm->fw) &

		~first_antenna(iwl_fw_valid_tx_ant(mvm->fw));

	if (!lq_sta->lq.dual_stream_ant_msk) {

	lq_sta->lq.dual_stream_ant_msk = ANT_AB;

	} else if (num_of_ant(iwl_fw_valid_tx_ant(mvm->fw)) == 2) {

		lq_sta->lq.dual_stream_ant_msk =

			iwl_fw_valid_tx_ant(mvm->fw);

	}



	/* as default allow aggregation for all tids */

	lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;
@@ -2463,8 +2455,6 @@ static void rs_fill_link_cmd(struct iwl_mvm *mvm, 


	if (num_of_ant(rate.ant) == 1)

		lq_cmd->single_stream_ant_msk = rate.ant;

	else if (num_of_ant(rate.ant) == 2)

		lq_cmd->dual_stream_ant_msk = rate.ant;

	/* otherwise we don't modify the existing value */



	index++;