diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 16:52:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 16:52:31 -0500 |
| commit | c0c84ef5c130f8871adbdaac2ba824b9195cb6d9 (patch) | |
| tree | d7221b5323d5a4d3d84676d32bdca21d21d85a18 /drivers/net/wireless/iwlwifi/iwl-power.c | |
| parent | 2360d2e8f01043632d6b651672bec66c49892f94 (diff) | |
| parent | 3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 25f7d474f346..1d1bf3234d8d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
| @@ -356,8 +356,7 @@ static void iwl_power_build_cmd(struct iwl_priv *priv, | |||
| 356 | 356 | ||
| 357 | if (priv->cfg->base_params->broken_powersave) | 357 | if (priv->cfg->base_params->broken_powersave) |
| 358 | iwl_power_sleep_cam_cmd(priv, cmd); | 358 | iwl_power_sleep_cam_cmd(priv, cmd); |
| 359 | else if (priv->cfg->base_params->supports_idle && | 359 | else if (priv->hw->conf.flags & IEEE80211_CONF_IDLE) |
| 360 | priv->hw->conf.flags & IEEE80211_CONF_IDLE) | ||
| 361 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); | 360 | iwl_static_sleep_cmd(priv, cmd, IWL_POWER_INDEX_5, 20); |
| 362 | else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && | 361 | else if (priv->cfg->ops->lib->tt_ops.lower_power_detection && |
| 363 | priv->cfg->ops->lib->tt_ops.tt_power_mode && | 362 | priv->cfg->ops->lib->tt_ops.tt_power_mode && |