lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Remove SetRFPowerStateInProgress

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack
2011-03-03 22:40:41 +09:00
committed by Greg Kroah-Hartman
parent 2cb61ea25b
commit fea84ba0f9
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8192e/r8190_rtl8256.c
View File

@@ -328,11 +328,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState)
bool bResult = true; bool bResult = true;
spin_lock(&priv->ps_lock); spin_lock(&priv->ps_lock);
if (priv->SetRFPowerStateInProgress) {
bResult = false;
goto out;
}
priv->SetRFPowerStateInProgress = true;
switch( eRFPowerState ) switch( eRFPowerState )
{ {
@@ -428,7 +423,6 @@ SetRFPowerState8190(struct net_device *dev, RT_RF_POWER_STATE eRFPowerState)
} }
out: out:
priv->SetRFPowerStateInProgress = false;
spin_unlock(&priv->ps_lock); spin_unlock(&priv->ps_lock);
return bResult; return bResult;
} }

1
drivers/staging/rtl8192e/r8192E.h
View File

@@ -1011,7 +1011,6 @@ typedef struct r8192_priv
bool bHwRadioOff; bool bHwRadioOff;
//by amy for ps //by amy for ps
bool RFChangeInProgress; // RF Chnage in progress, by Bruce, 2007-10-30 bool RFChangeInProgress; // RF Chnage in progress, by Bruce, 2007-10-30
bool SetRFPowerStateInProgress;
RT_OP_MODE OpMode; RT_OP_MODE OpMode;
//by amy for reset_count //by amy for reset_count
u32 reset_count; u32 reset_count;

1
drivers/staging/rtl8192e/r8192E_core.c
View File

@@ -1986,7 +1986,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->ieee80211->RfOffReason = 0; priv->ieee80211->RfOffReason = 0;
priv->RFChangeInProgress = false; priv->RFChangeInProgress = false;
priv->bHwRfOffAction = 0; priv->bHwRfOffAction = 0;
priv->SetRFPowerStateInProgress = false;
priv->ieee80211->PowerSaveControl.bInactivePs = true; priv->ieee80211->PowerSaveControl.bInactivePs = true;
priv->ieee80211->PowerSaveControl.bIPSModeBackup = false; priv->ieee80211->PowerSaveControl.bIPSModeBackup = false;