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

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

staging: rtl8192e: Remove member that's always false 



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

drivers/staging/rtl8192e/r8190_rtl8256.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -503,7 +503,6 @@ SetRFPowerState8190( 
					do

					do

					{

					{

						InitializeCount--;

						InitializeCount--;

						priv->RegRfOff = false;

						rtstatus = NicIFEnableNIC(dev);

						rtstatus = NicIFEnableNIC(dev);

					}while( (rtstatus != true) &&(InitializeCount >0) );

					}while( (rtstatus != true) &&(InitializeCount >0) );

drivers/staging/rtl8192e/r8192E.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1077,7 +1077,6 @@ typedef struct r8192_priv 
	u16 RegChannelPlan; // Channel Plan specifed by user, 15: following setting of EEPROM, 0-14: default channel plan index specified by user.

	u16 RegChannelPlan; // Channel Plan specifed by user, 15: following setting of EEPROM, 0-14: default channel plan index specified by user.

	u16 ChannelPlan;

	u16 ChannelPlan;

/*PS related*/

/*PS related*/

	bool RegRfOff;

	// Rf off action for power save

	// Rf off action for power save

	u8	bHwRfOffAction;	//0:No action, 1:By GPIO, 2:By Disable

	u8	bHwRfOffAction;	//0:No action, 1:By GPIO, 2:By Disable

/*PHY related*/

/*PHY related*/

drivers/staging/rtl8192e/r8192E_core.c

+1 −16
Original line number Original line Diff line number Diff line
@@ -2180,7 +2180,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) 
	priv->bDisableNormalResetCheck = false;

	priv->bDisableNormalResetCheck = false;

	priv->force_reset = false;

	priv->force_reset = false;

	//added by amy for power save

	//added by amy for power save

	priv->RegRfOff = 0;

	priv->ieee80211->RfOffReason = 0;

	priv->ieee80211->RfOffReason = 0;

	priv->RFChangeInProgress = false;

	priv->RFChangeInProgress = false;

	priv->bHwRfOffAction = 0;

	priv->bHwRfOffAction = 0;
@@ -3024,10 +3023,6 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev) 
	// For any kind of InitializeAdapter process, we shall use system now!!

	// For any kind of InitializeAdapter process, we shall use system now!!

	priv->pFirmware->firmware_status = FW_STATUS_0_INIT;

	priv->pFirmware->firmware_status = FW_STATUS_0_INIT;





	// Set to eRfoff in order not to count receive count.

	if(priv->RegRfOff == TRUE)

		priv->ieee80211->eRFPowerState = eRfOff;



	//

	//

	//3 //Config CPUReset Register

	//3 //Config CPUReset Register

	//3//

	//3//
@@ -3289,17 +3284,7 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev) 
#ifdef ENABLE_IPS

#ifdef ENABLE_IPS





{

{

	if(priv->RegRfOff == TRUE)

	if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_PS)

	{ // User disable RF via registry.

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RegRfOff ----------\n",__FUNCTION__);

		MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW);

#if 0//cosa, ask SD3 willis and he doesn't know what is this for

		// Those action will be discard in MgntActSet_RF_State because off the same state

	for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)

		PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0);

#endif

	}

	else if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_PS)

	{ // H/W or S/W RF OFF before sleep.

	{ // H/W or S/W RF OFF before sleep.

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason);

		RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason);

		MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason);

		MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason);