From: Mike McCormack <mikem@xxxxxxxxxx>
Signed-off-by: Mike McCormack <mikem@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/rtl8192e/r8190_rtl8256.c | 6 ------
drivers/staging/rtl8192e/r8192E.h | 1 -
drivers/staging/rtl8192e/r8192E_core.c | 1 -
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c
index 40a169d..0b6c7f9 100644
--- a/drivers/staging/rtl8192e/r8190_rtl8256.c
+++ b/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/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h
index 220f2b1..0c20fae 100644
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/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/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 8f68ac0..ec68f94 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/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;
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
