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

Commit 416ec4f3 authored by Avri Altman's avatar Avri Altman Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: Remove iwl_mvm_update_beacon_abort 



It is only called from iwl_mvm_power_set_ba() so simplify things
by removing it.

Signed-off-by: default avatarAvri Altman <avri.altman@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 8812182e

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

+12 −25
Original line number Diff line number Diff line
@@ -877,26 +877,6 @@ int iwl_mvm_enable_beacon_filter(struct iwl_mvm *mvm, 
	return _iwl_mvm_enable_beacon_filter(mvm, vif, &cmd, flags, false);

}



static int iwl_mvm_update_beacon_abort(struct iwl_mvm *mvm,

				       struct ieee80211_vif *vif,

				       bool enable)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_beacon_filter_cmd cmd = {

		IWL_BF_CMD_CONFIG_DEFAULTS,

		.bf_enable_beacon_filter = cpu_to_le32(1),

	};



	if (!mvmvif->bf_data.bf_enabled)

		return 0;



	if (mvm->cur_ucode == IWL_UCODE_WOWLAN)

		cmd.ba_escape_timer = cpu_to_le32(IWL_BA_ESCAPE_TIMER_D3);



	mvmvif->bf_data.ba_enabled = enable;

	return _iwl_mvm_enable_beacon_filter(mvm, vif, &cmd, 0, false);

}



static int _iwl_mvm_disable_beacon_filter(struct iwl_mvm *mvm,

					  struct ieee80211_vif *vif,

					  u32 flags, bool d0i3)
@@ -956,16 +936,23 @@ static int iwl_mvm_power_set_ba(struct iwl_mvm *mvm, 
				struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	bool ba_enable;

	struct iwl_beacon_filter_cmd cmd = {

		IWL_BF_CMD_CONFIG_DEFAULTS,

		.bf_enable_beacon_filter = cpu_to_le32(1),

	};



	if (!mvmvif->bf_data.bf_enabled)

		return 0;



	ba_enable = !(!mvmvif->pm_enabled || mvm->ps_disabled ||

	if (mvm->cur_ucode == IWL_UCODE_WOWLAN)

		cmd.ba_escape_timer = cpu_to_le32(IWL_BA_ESCAPE_TIMER_D3);



	mvmvif->bf_data.ba_enabled = !(!mvmvif->pm_enabled ||

				       mvm->ps_disabled ||

				       !vif->bss_conf.ps ||

				       iwl_mvm_vif_low_latency(mvmvif));



	return iwl_mvm_update_beacon_abort(mvm, vif, ba_enable);

	return _iwl_mvm_enable_beacon_filter(mvm, vif, &cmd, 0, false);

}



int iwl_mvm_power_update_ps(struct iwl_mvm *mvm)