]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
iwlwifi: remove useless priv->vif check
authorJohannes Berg <johannes.berg@intel.com>
Thu, 29 Apr 2010 11:43:08 +0000 (04:43 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Mon, 10 May 2010 22:08:59 +0000 (15:08 -0700)
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>
drivers/net/wireless/iwlwifi/iwl-power.c

index 2655dbdc8175ffb9172e80565eed4af82556a6f5..1fe9d844313d7ef67fb3f59706eece9e5b6e434a 100644 (file)
@@ -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);