From: Mike McCormack <mikem@ring3k.org>
Date: Sun, 6 Feb 2011 13:56:57 +0000 (+0900)
Subject: staging: rtl8192e: Remove dead code from MgntActSet_RF_State
X-Git-Tag: MMI-PSA29.97-13-9~20521^2~641
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ea66f752c003beed8839ecc07f187169309d9afd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: rtl8192e: Remove dead code from MgntActSet_RF_State

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/rtl8192e/r8190_rtl8256.c b/drivers/staging/rtl8192e/r8190_rtl8256.c
index 6f63f9cd1154..1b1034bf7e54 100644
--- a/drivers/staging/rtl8192e/r8190_rtl8256.c
+++ b/drivers/staging/rtl8192e/r8190_rtl8256.c
@@ -812,11 +812,6 @@ MgntActSet_RF_State(
 	switch(StateToSet)
 	{
 	case eRfOn:
-		//
-		// Turn On RF no matter the IPS setting because we need to update the RF state to Ndis under Vista, or
-		// the Windows does not allow the driver to perform site survey any more. By Bruce, 2007-10-02.
-		//
-
 		priv->ieee80211->RfOffReason &= (~ChangeSource);
 
 		if(! priv->ieee80211->RfOffReason)
@@ -837,21 +832,11 @@ MgntActSet_RF_State(
 
 	case eRfOff:
 
-			if (priv->ieee80211->RfOffReason > RF_CHANGE_BY_IPS)
-			{
-				//
-				// 060808, Annie:
-				// Disconnect to current BSS when radio off. Asked by QuanTa.
-				//
-				// Set all link status falg, by Bruce, 2007-06-26.
-				//MgntActSet_802_11_DISASSOCIATE( Adapter, disas_lv_ss );
-				MgntDisconnect(dev, disas_lv_ss);
-
-				// Clear content of bssDesc[] and bssDesc4Query[] to avoid reporting old bss to UI.
-				// 2007.05.28, by shien chang.
-
-			}
-
+		if (priv->ieee80211->RfOffReason > RF_CHANGE_BY_IPS)
+		{
+			// Disconnect to current BSS when radio off. Asked by QuanTa.
+			MgntDisconnect(dev, disas_lv_ss);
+		}
 
 		priv->ieee80211->RfOffReason |= ChangeSource;
 		bActionAllowed = true;
@@ -861,30 +846,13 @@ MgntActSet_RF_State(
 		priv->ieee80211->RfOffReason |= ChangeSource;
 		bActionAllowed = true;
 		break;
-
-	default:
-		break;
 	}
 
-	if(bActionAllowed)
+	if (bActionAllowed)
 	{
 		RT_TRACE(COMP_POWER, "MgntActSet_RF_State(): Action is allowed.... StateToSet(%d), RfOffReason(%#X)\n", StateToSet, priv->ieee80211->RfOffReason);
-				// Config HW to the specified mode.
+		// Config HW to the specified mode.
 		SetRFPowerState(dev, StateToSet);
-		// Turn on RF.
-		if(StateToSet == eRfOn)
-		{
-			//Adapter->HalFunc.HalEnableRxHandler(Adapter);
-			if(bConnectBySSID)
-			{
-				//MgntActSet_802_11_SSID(Adapter, Adapter->MgntInfo.Ssid.Octet, Adapter->MgntInfo.Ssid.Length, TRUE );
-			}
-		}
-		// Turn off RF.
-		else if(StateToSet == eRfOff)
-		{
-			//Adapter->HalFunc.HalDisableRxHandler(Adapter);
-		}
 	}
 	else
 	{