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

Commit ade50652 authored by Alexander Bondar's avatar Alexander Bondar Committed by Johannes Berg
Browse files

iwlwifi: mvm: remove usage of power_save module parameter 



Make power management in MVM driver enabled by default and
remove using the power_save module parameter. Rely only on
the power_scheme parameter to decide if power management
should be used.

Signed-off-by: default avatarAlexander Bondar <alexander.bondar@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a6db0061

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

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 


	hw->wiphy->hw_version = mvm->trans->hw_id;



	if (iwlwifi_mod_params.power_save)

	if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)

		hw->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;

	else

		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

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

+2 −4
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	 */

	cmd->keep_alive_seconds = POWER_KEEP_ALIVE_PERIOD_SEC;



	if ((iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM) ||

	    !iwlwifi_mod_params.power_save)

	if (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM)

		return;



	cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);
@@ -171,8 +170,7 @@ int iwl_mvm_power_disable(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)

		return 0;



	if ((iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM) &&

	    iwlwifi_mod_params.power_save)

	if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)

		cmd.flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);



	iwl_mvm_power_log(mvm, &cmd);