From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 29 Apr 2010 11:43:08 +0000 (-0700)
Subject: iwlwifi: remove useless priv->vif check
X-Git-Tag: v2.6.35-rc1~473^2~42^2^2~45
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=3a065ab3b57bedefa1d59c88f731da6513ac482a;p=net-next-2.6.git

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>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index 2655dbdc817..1fe9d844313 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);