aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/r8192E_core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/rtl8192e/r8192E_core.c')
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index eb7e0e18c2c..20f20414827 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -2180,7 +2180,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
2180 priv->bDisableNormalResetCheck = false; 2180 priv->bDisableNormalResetCheck = false;
2181 priv->force_reset = false; 2181 priv->force_reset = false;
2182 //added by amy for power save 2182 //added by amy for power save
2183 priv->RegRfOff = 0;
2184 priv->ieee80211->RfOffReason = 0; 2183 priv->ieee80211->RfOffReason = 0;
2185 priv->RFChangeInProgress = false; 2184 priv->RFChangeInProgress = false;
2186 priv->bHwRfOffAction = 0; 2185 priv->bHwRfOffAction = 0;
@@ -3024,10 +3023,6 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
3024 // For any kind of InitializeAdapter process, we shall use system now!! 3023 // For any kind of InitializeAdapter process, we shall use system now!!
3025 priv->pFirmware->firmware_status = FW_STATUS_0_INIT; 3024 priv->pFirmware->firmware_status = FW_STATUS_0_INIT;
3026 3025
3027 // Set to eRfoff in order not to count receive count.
3028 if(priv->RegRfOff == TRUE)
3029 priv->ieee80211->eRFPowerState = eRfOff;
3030
3031 // 3026 //
3032 //3 //Config CPUReset Register 3027 //3 //Config CPUReset Register
3033 //3// 3028 //3//
@@ -3289,17 +3284,7 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev)
3289#ifdef ENABLE_IPS 3284#ifdef ENABLE_IPS
3290 3285
3291{ 3286{
3292 if(priv->RegRfOff == TRUE) 3287 if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_PS)
3293 { // User disable RF via registry.
3294 RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RegRfOff ----------\n",__FUNCTION__);
3295 MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW);
3296#if 0//cosa, ask SD3 willis and he doesn't know what is this for
3297 // Those action will be discard in MgntActSet_RF_State because off the same state
3298 for(eRFPath = 0; eRFPath <pHalData->NumTotalRFPath; eRFPath++)
3299 PHY_SetRFReg(Adapter, (RF90_RADIO_PATH_E)eRFPath, 0x4, 0xC00, 0x0);
3300#endif
3301 }
3302 else if(priv->ieee80211->RfOffReason > RF_CHANGE_BY_PS)
3303 { // H/W or S/W RF OFF before sleep. 3288 { // H/W or S/W RF OFF before sleep.
3304 RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason); 3289 RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __FUNCTION__,priv->ieee80211->RfOffReason);
3305 MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason); 3290 MgntActSet_RF_State(dev, eRfOff, priv->ieee80211->RfOffReason);