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

Commit 3f1e5f4a authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: move no_sleep_autoadjust as part of iwlagn_mod_params 



Move no_sleep_autoadjust module parameter into iwlagn_mod_params structure
along with all the other iwlagn module parameters

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 6b0184c4

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+1 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ struct iwl_mod_params iwlagn_mod_params = { 
	.restart_fw = 1,

	.plcp_check = true,

	.bt_coex_active = true,

	.no_sleep_autoadjust = true,

	/* the rest are 0 by default */

};

drivers/net/wireless/iwlwifi/iwl-agn.c

+10 −0
Original line number Diff line number Diff line
@@ -4099,3 +4099,13 @@ MODULE_PARM_DESC(bt_coex_active, "enable wifi/bt co-exist (default: enable)"); 
module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO);

MODULE_PARM_DESC(led_mode, "0=system default, "

		"1=On(RF On)/Off(RF Off), 2=blinking (default: 0)");



/*

 * For now, keep using power level 1 instead of automatically

 * adjusting ...

 */

module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust,

		bool, S_IRUGO);

MODULE_PARM_DESC(no_sleep_autoadjust,

		 "don't automatically adjust sleep level "

		 "according to maximum network latency (default: true)");

drivers/net/wireless/iwlwifi/iwl-core.h

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct iwl_mod_params { 
	bool ack_check;		/* def: false = disable ack health check */

	bool bt_coex_active;	/* def: true = enable bt coex */

	int led_mode;		/* def: 0 = system default */

	bool no_sleep_autoadjust; /* def: true = disable autoadjust */

};



/*

drivers/net/wireless/iwlwifi/iwl-power.c

+2 −11
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


#include "iwl-eeprom.h"

#include "iwl-dev.h"

#include "iwl-agn.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-commands.h"
@@ -50,16 +51,6 @@ 
 * also use pre-defined power levels.

 */



/*

 * For now, keep using power level 1 instead of automatically

 * adjusting ...

 */

bool no_sleep_autoadjust = true;

module_param(no_sleep_autoadjust, bool, S_IRUGO);

MODULE_PARM_DESC(no_sleep_autoadjust,

		 "don't automatically adjust sleep level "

		 "according to maximum network latency");



/*

 * This defines the old power levels. They are still used by default

 * (level 1) and for thermal throttle (levels 3 through 5)
@@ -367,7 +358,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, 
		iwl_static_sleep_cmd(priv, cmd,

				     priv->power_data.debug_sleep_level_override,

				     dtimper);

	else if (no_sleep_autoadjust)

	else if (iwlagn_mod_params.no_sleep_autoadjust)

		iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_1, dtimper);

	else

		iwl_power_fill_sleep_cmd(priv, cmd,