diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-03 16:36:41 -0700 |
| commit | 5be1334062a2f358dc65016b5181e6edbfe3bd1e (patch) | |
| tree | 02ec7afd0cacda2f364e49f0c8391690f6b41a24 /drivers/net/wireless/iwlwifi/iwl-power.c | |
| parent | f2c31e32b378a6653f8de606149d963baf11d7d3 (diff) | |
| parent | a5d5a914770a81a1f775be2ee35b9fa8fd19d381 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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, if (priv->wowlan) iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, dtimper); - else if (priv->hw->conf.flags & IEEE80211_CONF_IDLE) + else if (!priv->cfg->base_params->no_idle_support && + priv->hw->conf.flags & IEEE80211_CONF_IDLE) iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); else if (iwl_tt_is_low_power_state(priv)) { /* in thermal throttling low power state */ |