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

Commit 3a23d695 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: set correct single/dual stream mask 



Even the initial single/dual stream values will be overridden later when
issue link quality command; but still make sense not to use hard-code
value during initialization. Single/Dual stream mask are used to indicate the
best antenna for SISO/MIMO; different NIC has different tx antenna
configuration; so the parameter need to based on the valid tx antenna.

1x2 device: single tx antenna available, only SISO is valid
configuration, but still need to set up MIMO configuration, so set it up
with antenna A & B as default.
2x2 device: two tx antenna available, dual_stream will use both valid
antenna.

3x3 device: three tx antenna available, skip the first antenna and
choice the second and third antenna for dual_stream.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 8715fa28

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+11 −2
Original line number Diff line number Diff line
@@ -2557,8 +2557,17 @@ void iwl_rs_rate_init(struct iwl_priv *priv, struct ieee80211_sta *sta, u8 sta_i 
		     lq_sta->active_mimo3_rate);



	/* These values will be overridden later */

	lq_sta->lq.general_params.single_stream_ant_msk = ANT_A;

	lq_sta->lq.general_params.single_stream_ant_msk =

		first_antenna(priv->hw_params.valid_tx_ant);

	lq_sta->lq.general_params.dual_stream_ant_msk =

		priv->hw_params.valid_tx_ant &

		~first_antenna(priv->hw_params.valid_tx_ant);

	if (!lq_sta->lq.general_params.dual_stream_ant_msk) {

		lq_sta->lq.general_params.dual_stream_ant_msk = ANT_AB;

	} else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {

		lq_sta->lq.general_params.dual_stream_ant_msk =

			priv->hw_params.valid_tx_ant;

	}



	/* as default allow aggregation for all tids */

	lq_sta->tx_agg_tid_en = IWL_AGG_ALL_TID;

drivers/net/wireless/iwlwifi/iwl-sta.c

+11 −1
Original line number Diff line number Diff line
@@ -451,7 +451,17 @@ static void iwl_sta_init_lq(struct iwl_priv *priv, const u8 *addr, bool is_ap) 


	link_cmd.general_params.single_stream_ant_msk =

				first_antenna(priv->hw_params.valid_tx_ant);

	link_cmd.general_params.dual_stream_ant_msk = 3;



	link_cmd.general_params.dual_stream_ant_msk =

		priv->hw_params.valid_tx_ant &

		~first_antenna(priv->hw_params.valid_tx_ant);

	if (!link_cmd.general_params.dual_stream_ant_msk) {

		link_cmd.general_params.dual_stream_ant_msk = ANT_AB;

	} else if (num_of_ant(priv->hw_params.valid_tx_ant) == 2) {

		link_cmd.general_params.dual_stream_ant_msk =

			priv->hw_params.valid_tx_ant;

	}



	link_cmd.agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;

	link_cmd.agg_params.agg_time_limit =

		cpu_to_le16(LINK_QUAL_AGG_TIME_LIMIT_DEF);