summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-power.c
diff options
context:
space:
mode:
authorJohannes Berg2010-04-29 13:43:08 +0200
committerReinette Chatre2010-05-11 00:08:59 +0200
commit3a065ab3b57bedefa1d59c88f731da6513ac482a (patch)
treeedec5bdbbc93981936924ac507c0d51d28169b5c /drivers/net/wireless/iwlwifi/iwl-power.c
parentiwlagn: use virtual interface in TX aggregation handling (diff)
downloadkernel-qcow2-linux-3a065ab3b57bedefa1d59c88f731da6513ac482a.tar.gz
kernel-qcow2-linux-3a065ab3b57bedefa1d59c88f731da6513ac482a.tar.xz
kernel-qcow2-linux-3a065ab3b57bedefa1d59c88f731da6513ac482a.zip
iwlwifi: remove useless priv->vif check
This check is not useful, since we now no longer dereference priv->vif at this spot. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-power.c5
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 2655dbdc8175..1fe9d844313d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -317,10 +317,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);