diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-17 21:57:43 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-17 21:57:43 +0400 |
| commit | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (patch) | |
| tree | 711dff90df5ca4e07b5bddf11b2819e5cf2b7a93 /drivers/net/wireless/iwlwifi/iwl-power.c | |
| parent | 278554bd6579206921f5d8a523649a7a57f8850d (diff) | |
| parent | 0c348d7c1422d59a86d6fb37b53d75788043e50b (diff) | |
| download | linux-6fe70aae0d128339febfabc073ba4c4a03de4f45.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 581c683a8507..cda6a94d6cc9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c @@ -318,10 +318,7 @@ int iwl_power_update_mode(struct iwl_priv *priv, bool force) update_chains = priv->chain_noise_data.state == IWL_CHAIN_NOISE_DONE || priv->chain_noise_data.state == IWL_CHAIN_NOISE_ALIVE; - if (priv->vif) - dtimper = priv->hw->conf.ps_dtim_period; - else - dtimper = 1; + dtimper = priv->hw->conf.ps_dtim_period ?: 1; if (priv->cfg->broken_powersave) iwl_power_sleep_cam_cmd(priv, &cmd); |