---

yaml --- r: 236275 b: refs/heads/master c: fea84ba h: refs/heads/master i: 236273: 2e57f75 236271: 3aa2ef6 v: v3
git-mirror · Mar 7, 2011 · 6f46fad · 6f46fad
1 parent 5d364c5
commit 6f46fad
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cb61ea25b49049f9281007f8b534e5d384ebba5
+refs/heads/master: fea84ba0f982a57598a92cd806904395f1b8839f
diff --git a/trunk/drivers/staging/rtl8192e/r8190_rtl8256.c b/trunk/drivers/staging/rtl8192e/r8190_rtl8256.c
@@ -328,11 +328,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState)
 	bool bResult = true;
 
 	spin_lock(&priv->ps_lock);
-	if (priv->SetRFPowerStateInProgress) {
-		bResult = false;
-		goto out;
-	}
-	priv->SetRFPowerStateInProgress = true;
 
 	switch( eRFPowerState )
 	{
@@ -428,7 +423,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState)
 	}
 
 out:
-	priv->SetRFPowerStateInProgress = false;
 	spin_unlock(&priv->ps_lock);
 	return bResult;
 }

diff --git a/trunk/drivers/staging/rtl8192e/r8192E.h b/trunk/drivers/staging/rtl8192e/r8192E.h
@@ -1011,7 +1011,6 @@ typedef struct r8192_priv
 	bool bHwRadioOff;
 	//by amy for ps
 	bool RFChangeInProgress; // RF Chnage in progress, by Bruce, 2007-10-30
-	bool SetRFPowerStateInProgress;
 	RT_OP_MODE OpMode;
 	//by amy for reset_count
 	u32 reset_count;

diff --git a/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c
@@ -1986,7 +1986,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
 	priv->ieee80211->RfOffReason = 0;
 	priv->RFChangeInProgress = false;
 	priv->bHwRfOffAction = 0;
-	priv->SetRFPowerStateInProgress = false;
 	priv->ieee80211->PowerSaveControl.bInactivePs = true;
 	priv->ieee80211->PowerSaveControl.bIPSModeBackup = false;