lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlagn: move no_sleep_autoadjust as part of iwlagn_mod_params

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

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Wey-Yi Guy
2011-06-03 13:52:40 -07:00
parent 6b0184c4c6
commit 3f1e5f4a2b
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
View File

@@ -623,6 +623,7 @@ struct iwl_mod_params iwlagn_mod_params = {
.restart_fw = 1, .restart_fw = 1,
.plcp_check = true, .plcp_check = true,
.bt_coex_active = true, .bt_coex_active = true,
.no_sleep_autoadjust = true,
/* the rest are 0 by default */ /* the rest are 0 by default */
}; };

10
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@@ -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_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO);
MODULE_PARM_DESC(led_mode, "0=system default, " MODULE_PARM_DESC(led_mode, "0=system default, "
"1=On(RF On)/Off(RF Off), 2=blinking (default: 0)"); "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)");

1
drivers/net/wireless/iwlwifi/iwl-core.h
View File

@@ -175,6 +175,7 @@ struct iwl_mod_params {
bool ack_check; /* def: false = disable ack health check */ bool ack_check; /* def: false = disable ack health check */
bool bt_coex_active; /* def: true = enable bt coex */ bool bt_coex_active; /* def: true = enable bt coex */
int led_mode; /* def: 0 = system default */ int led_mode; /* def: 0 = system default */
bool no_sleep_autoadjust; /* def: true = disable autoadjust */
}; };
/* /*

13
drivers/net/wireless/iwlwifi/iwl-power.c
View File

@@ -36,6 +36,7 @@
#include "iwl-eeprom.h" #include "iwl-eeprom.h"
#include "iwl-dev.h" #include "iwl-dev.h"
#include "iwl-agn.h"
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-io.h" #include "iwl-io.h"
#include "iwl-commands.h" #include "iwl-commands.h"
@@ -50,16 +51,6 @@
* also use pre-defined power levels. * 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 * This defines the old power levels. They are still used by default
* (level 1) and for thermal throttle (levels 3 through 5) * (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, iwl_static_sleep_cmd(priv, cmd,
priv->power_data.debug_sleep_level_override, priv->power_data.debug_sleep_level_override,
dtimper); 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); iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_1, dtimper);
else else
iwl_power_fill_sleep_cmd(priv, cmd, iwl_power_fill_sleep_cmd(priv, cmd,