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

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

iwlwifi: mvm: Rename some power management definitions and methods 



Replace SLEEP_OVER_DTIM by SKIP_OVER_DTIM.
Add iwl_mvm prefix to a function name.

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 83bdad52

drivers/net/wireless/iwlwifi/mvm/fw-api-power.h

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
 *		receiver and transmitter. '0' - does not allow.

 * @POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK: '0' Driver disables power management,

 *		'1' Driver enables PM (use rest of parameters)

 * @POWER_FLAGS_SLEEP_OVER_DTIM_MSK: '0' PM have to walk up every DTIM,

 * @POWER_FLAGS_SKIP_OVER_DTIM_MSK: '0' PM have to walk up every DTIM,

 *		'1' PM could sleep over DTIM till listen Interval.

 * @POWER_FLAGS_ADVANCE_PM_ENA_MSK: Advanced PM (uAPSD) enable mask

 * @POWER_FLAGS_LPRX_ENA_MSK: Low Power RX enable.
@@ -80,7 +80,7 @@ 
enum iwl_power_flags {

	POWER_FLAGS_POWER_SAVE_ENA_MSK		= BIT(0),

	POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK	= BIT(1),

	POWER_FLAGS_SLEEP_OVER_DTIM_MSK		= BIT(2),

	POWER_FLAGS_SKIP_OVER_DTIM_MSK		= BIT(2),

	POWER_FLAGS_ADVANCE_PM_ENA_MSK		= BIT(9),

	POWER_FLAGS_LPRX_ENA_MSK		= BIT(11),

};

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

+6 −5
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ 


#define POWER_KEEP_ALIVE_PERIOD_SEC    25



static void iwl_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm,

				    struct ieee80211_vif *vif,

				    struct iwl_powertable_cmd *cmd)

{

	struct ieee80211_hw *hw = mvm->hw;
@@ -107,7 +108,7 @@ static void iwl_power_build_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	/* Check skip over DTIM conditions */

	if (!radar_detect && (dtimper <= 10) &&

	    (iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_LP))

		cmd->flags |= cpu_to_le16(POWER_FLAGS_SLEEP_OVER_DTIM_MSK);

		cmd->flags |= cpu_to_le16(POWER_FLAGS_SKIP_OVER_DTIM_MSK);



	/* Check that keep alive period is at least 3 * DTIM */

	dtimper_msec = dtimper * vif->bss_conf.beacon_int;
@@ -139,7 +140,7 @@ int iwl_mvm_power_update_mode(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)

		return 0;



	iwl_power_build_cmd(mvm, vif, &cmd);

	iwl_mvm_power_build_cmd(mvm, vif, &cmd);



	IWL_DEBUG_POWER(mvm,

			"Sending power table command for power level %d, flags = 0x%X\n",
@@ -184,6 +185,6 @@ int iwl_mvm_power_disable(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
void iwl_power_get_params(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			  struct iwl_powertable_cmd *cmd)

{

	iwl_power_build_cmd(mvm, vif, cmd);

	iwl_mvm_power_build_cmd(mvm, vif, cmd);

}

#endif /* CONFIG_IWLWIFI_DEBUGFS */