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

Commit c94aace0 authored by Kirtika Ruchandani's avatar Kirtika Ruchandani Committed by Luca Coelho
Browse files

iwlwifi: mvm: rs: Remove unused 'mvmvif'/'mvmsta' variables 



mvmvif is defined and set in rs_mimo_allow but not used. Compiling
iwlwifi with W=1 gives the following warning, remove it. mvmsta is
used only to obtain mvmvif so remove it as well.

iwlwifi/mvm/rs.c: In function 'rs_mimo_allow':
iwlwifi/mvm/rs.c:165:22: warning: variable 'mvmvif' set but not used.[-Wunused-but-set-variable]

This fix removes calls to iwl_mvm_sta_from_mac &
iwl_mvm_vif_from_mac. They are both accessors, and do not have any
side-effects.  Commit e621c228 ("iwlwifi: rs: Remove workaround
that disables MIMO on P2P") removed a workaround that disabled MIMO on
P2P, 'mvmvif' was used for that workaround, but not removed with it.

Fixes: e621c228 ("iwlwifi: rs: Remove workaround that disables MIMO on P2P")
Signed-off-by: default avatarKirtika Ruchandani <kirtika@google.com>
Cc: Alexander Bondar <alexander.bondar@intel.com>
Cc: Emmanuel Grumbach <emmmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 7b1be5ad

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

+0 −6
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
			  struct rs_rate *rate,

			  const struct rs_tx_column *next_col)

{

	struct iwl_mvm_sta *mvmsta;

	struct iwl_mvm_vif *mvmvif;



	if (!sta->ht_cap.ht_supported)

		return false;
@@ -176,9 +173,6 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	if (!iwl_mvm_bt_coex_is_mimo_allowed(mvm, sta))

		return false;



	mvmsta = iwl_mvm_sta_from_mac80211(sta);

	mvmvif = iwl_mvm_vif_from_mac80211(mvmsta->vif);



	if (mvm->nvm_data->sku_cap_mimo_disabled)

		return false;