diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-03 16:52:40 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-11 10:08:52 -0400 |
commit | 3f1e5f4a2b0993b6e81b5665b28568624f581b0f (patch) | |
tree | a8f263154ebf7fa3734cffaafe719caa28f553ac /drivers/net/wireless | |
parent | 6b0184c4c62beb15443fd6dd5080f0e18941b67b (diff) |
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: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 13 |
4 files changed, 14 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index f0dacfbe8e9..58f6da0acfd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -623,6 +623,7 @@ struct iwl_mod_params iwlagn_mod_params = { | |||
623 | .restart_fw = 1, | 623 | .restart_fw = 1, |
624 | .plcp_check = true, | 624 | .plcp_check = true, |
625 | .bt_coex_active = true, | 625 | .bt_coex_active = true, |
626 | .no_sleep_autoadjust = true, | ||
626 | /* the rest are 0 by default */ | 627 | /* the rest are 0 by default */ |
627 | }; | 628 | }; |
628 | 629 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 32683568d39..8bed31539c5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -4099,3 +4099,13 @@ MODULE_PARM_DESC(bt_coex_active, "enable wifi/bt co-exist (default: enable)"); | |||
4099 | module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO); | 4099 | module_param_named(led_mode, iwlagn_mod_params.led_mode, int, S_IRUGO); |
4100 | MODULE_PARM_DESC(led_mode, "0=system default, " | 4100 | MODULE_PARM_DESC(led_mode, "0=system default, " |
4101 | "1=On(RF On)/Off(RF Off), 2=blinking (default: 0)"); | 4101 | "1=On(RF On)/Off(RF Off), 2=blinking (default: 0)"); |
4102 | |||
4103 | /* | ||
4104 | * For now, keep using power level 1 instead of automatically | ||
4105 | * adjusting ... | ||
4106 | */ | ||
4107 | module_param_named(no_sleep_autoadjust, iwlagn_mod_params.no_sleep_autoadjust, | ||
4108 | bool, S_IRUGO); | ||
4109 | MODULE_PARM_DESC(no_sleep_autoadjust, | ||
4110 | "don't automatically adjust sleep level " | ||
4111 | "according to maximum network latency (default: true)"); | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index f950da02b21..a16daf72e67 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -175,6 +175,7 @@ struct iwl_mod_params { | |||
175 | bool ack_check; /* def: false = disable ack health check */ | 175 | bool ack_check; /* def: false = disable ack health check */ |
176 | bool bt_coex_active; /* def: true = enable bt coex */ | 176 | bool bt_coex_active; /* def: true = enable bt coex */ |
177 | int led_mode; /* def: 0 = system default */ | 177 | int led_mode; /* def: 0 = system default */ |
178 | bool no_sleep_autoadjust; /* def: true = disable autoadjust */ | ||
178 | }; | 179 | }; |
179 | 180 | ||
180 | /* | 181 | /* |
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 595c930b28a..a69b5512417 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
@@ -36,6 +36,7 @@ | |||
36 | 36 | ||
37 | #include "iwl-eeprom.h" | 37 | #include "iwl-eeprom.h" |
38 | #include "iwl-dev.h" | 38 | #include "iwl-dev.h" |
39 | #include "iwl-agn.h" | ||
39 | #include "iwl-core.h" | 40 | #include "iwl-core.h" |
40 | #include "iwl-io.h" | 41 | #include "iwl-io.h" |
41 | #include "iwl-commands.h" | 42 | #include "iwl-commands.h" |
@@ -51,16 +52,6 @@ | |||
51 | */ | 52 | */ |
52 | 53 | ||
53 | /* | 54 | /* |
54 | * For now, keep using power level 1 instead of automatically | ||
55 | * adjusting ... | ||
56 | */ | ||
57 | bool no_sleep_autoadjust = true; | ||
58 | module_param(no_sleep_autoadjust, bool, S_IRUGO); | ||
59 | MODULE_PARM_DESC(no_sleep_autoadjust, | ||
60 | "don't automatically adjust sleep level " | ||
61 | "according to maximum network latency"); | ||
62 | |||
63 | /* | ||
64 | * This defines the old power levels. They are still used by default | 55 | * This defines the old power levels. They are still used by default |
65 | * (level 1) and for thermal throttle (levels 3 through 5) | 56 | * (level 1) and for thermal throttle (levels 3 through 5) |
66 | */ | 57 | */ |
@@ -367,7 +358,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, | |||
367 | iwl_static_sleep_cmd(priv, cmd, | 358 | iwl_static_sleep_cmd(priv, cmd, |
368 | priv->power_data.debug_sleep_level_override, | 359 | priv->power_data.debug_sleep_level_override, |
369 | dtimper); | 360 | dtimper); |
370 | else if (no_sleep_autoadjust) | 361 | else if (iwlagn_mod_params.no_sleep_autoadjust) |
371 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_1, dtimper); | 362 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_1, dtimper); |
372 | else | 363 | else |
373 | iwl_power_fill_sleep_cmd(priv, cmd, | 364 | iwl_power_fill_sleep_cmd(priv, cmd, |