diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-08-03 09:18:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-03 09:18:21 -0400 |
| commit | a5d5a914770a81a1f775be2ee35b9fa8fd19d381 (patch) | |
| tree | ed07597966e91e3903faf305d69a2c5e1d109b91 /drivers/net/wireless/iwlwifi/iwl-power.c | |
| parent | d5eab9152a3b4ce962c02ad0a0e4d0ec94aadd92 (diff) | |
| parent | f35291082294ca6737953bbe4e9491ede04ab822 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 3ec619c6881c..cd64df05f9ed 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
| @@ -349,7 +349,8 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, | |||
| 349 | 349 | ||
| 350 | if (priv->wowlan) | 350 | if (priv->wowlan) |
| 351 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, dtimper); | 351 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, dtimper); |
| 352 | else if (priv->hw->conf.flags & IEEE80211_CONF_IDLE) | 352 | else if (!priv->cfg->base_params->no_idle_support && |
| 353 | priv->hw->conf.flags & IEEE80211_CONF_IDLE) | ||
| 353 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); | 354 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); |
| 354 | else if (iwl_tt_is_low_power_state(priv)) { | 355 | else if (iwl_tt_is_low_power_state(priv)) { |
| 355 | /* in thermal throttling low power state */ | 356 | /* in thermal throttling low power state */ |