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

Commit 656fca00 authored by Avraham Stern's avatar Avraham Stern Committed by Luca Coelho
Browse files

iwlwifi: mvm: switch management tx antenna only on tx failure 



Switch the antenna used for management tx only if previous tx failed.
If previous tx succeeded, there is no reason to switch antennas.

Signed-off-by: default avatarAvraham Stern <avraham.stern@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 47242744

drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c

+2 −5
Original line number Diff line number Diff line
@@ -965,11 +965,8 @@ static void iwl_mvm_mac_ctxt_set_tx(struct iwl_mvm *mvm, 
	tx->tx_flags = cpu_to_le32(tx_flags);



	if (!fw_has_capa(&mvm->fw->ucode_capa,

			 IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION)) {

		mvm->mgmt_last_antenna_idx =

			iwl_mvm_next_antenna(mvm, iwl_mvm_get_valid_tx_ant(mvm),

					     mvm->mgmt_last_antenna_idx);

	}

			 IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION))

		iwl_mvm_toggle_tx_ant(mvm, &mvm->mgmt_last_antenna_idx);



	tx->rate_n_flags =

		cpu_to_le32(BIT(mvm->mgmt_last_antenna_idx) <<

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+5 −0
Original line number Diff line number Diff line
@@ -1522,6 +1522,11 @@ static inline u8 iwl_mvm_get_valid_rx_ant(struct iwl_mvm *mvm) 
	       mvm->fw->valid_rx_ant;

}



static inline void iwl_mvm_toggle_tx_ant(struct iwl_mvm *mvm, u8 *ant)

{

	*ant = iwl_mvm_next_antenna(mvm, iwl_mvm_get_valid_tx_ant(mvm), *ant);

}



static inline u32 iwl_mvm_get_phy_config(struct iwl_mvm *mvm)

{

	u32 phy_config = ~(FW_PHY_CFG_TX_CHAIN |

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+2 −0
Original line number Diff line number Diff line
@@ -845,6 +845,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, 


	iwl_mvm_tof_init(mvm);



	iwl_mvm_toggle_tx_ant(mvm, &mvm->mgmt_last_antenna_idx);



	return op_mode;



 out_unregister:

drivers/net/wireless/intel/iwlwifi/mvm/scan.c

+1 −3
Original line number Diff line number Diff line
@@ -205,9 +205,7 @@ iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum nl80211_band band, 
{

	u32 tx_ant;



	mvm->scan_last_antenna_idx =

		iwl_mvm_next_antenna(mvm, iwl_mvm_get_valid_tx_ant(mvm),

				     mvm->scan_last_antenna_idx);

	iwl_mvm_toggle_tx_ant(mvm, &mvm->scan_last_antenna_idx);

	tx_ant = BIT(mvm->scan_last_antenna_idx) << RATE_MCS_ANT_POS;



	if (band == NL80211_BAND_2GHZ && !no_cck)

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+4 −4
Original line number Diff line number Diff line
@@ -381,10 +381,6 @@ void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, struct iwl_tx_cmd *tx_cmd, 
			cpu_to_le32(TX_CMD_FLG_ACK | TX_CMD_FLG_BAR);

	}



	mvm->mgmt_last_antenna_idx =

		iwl_mvm_next_antenna(mvm, iwl_mvm_get_valid_tx_ant(mvm),

				     mvm->mgmt_last_antenna_idx);



	/* Set the rate in the TX cmd */

	tx_cmd->rate_n_flags = cpu_to_le32(iwl_mvm_get_tx_rate(mvm, info, sta));

}
@@ -1501,6 +1497,10 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, 
			break;

		}



		if ((status & TX_STATUS_MSK) != TX_STATUS_SUCCESS &&

		    ieee80211_is_mgmt(hdr->frame_control))

			iwl_mvm_toggle_tx_ant(mvm, &mvm->mgmt_last_antenna_idx);



		/*

		 * If we are freeing multiple frames, mark all the frames

		 * but the first one as acked, since they were acknowledged