aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-power.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-04-18 12:30:09 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-04-18 12:30:09 -0400
commitf42e7662815647c1a6f73e160abcdf812d3057d2 (patch)
tree1038418013c66220fd0a8524db5787b0142ece50 /drivers/net/wireless/iwlwifi/iwl-power.c
parentb7af6a99690503a48c63ce5e587b4e4555f31cdb (diff)
iwlagn: temperature should be measure for all _agn devices
Thermal throttling functions are available for all _agn devices, call the functions directly. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-power.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index b7cd95820ff8..595c930b28ae 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -357,12 +357,10 @@ static void iwl_power_build_cmd(struct iwl_priv *priv,
357 357
358 if (priv->hw->conf.flags & IEEE80211_CONF_IDLE) 358 if (priv->hw->conf.flags & IEEE80211_CONF_IDLE)
359 iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); 359 iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20);
360 else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && 360 else if (iwl_tt_is_low_power_state(priv)) {
361 priv->cfg->ops->lib->tt_ops.tt_power_mode &&
362 priv->cfg->ops->lib->tt_ops.lower_power_detection(priv)) {
363 /* in thermal throttling low power state */ 361 /* in thermal throttling low power state */
364 iwl_static_sleep_cmd(priv, cmd, 362 iwl_static_sleep_cmd(priv, cmd,
365 priv->cfg->ops->lib->tt_ops.tt_power_mode(priv), dtimper); 363 iwl_tt_current_power_mode(priv), dtimper);
366 } else if (!enabled) 364 } else if (!enabled)
367 iwl_power_sleep_cam_cmd(priv, cmd); 365 iwl_power_sleep_cam_cmd(priv, cmd);
368 else if (priv->power_data.debug_sleep_level_override >= 0) 366 else if (priv->power_data.debug_sleep_level_override >= 0)