Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea84ba0 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove SetRFPowerStateInProgress 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2cb61ea2

drivers/staging/rtl8192e/r8190_rtl8256.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/rtl8192e/r8192E.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8192e/r8192E_core.c

+0 −1
Original line number Diff line number Diff line
@@ -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;