---

yaml --- r: 267663 b: refs/heads/master c: d064307 h: refs/heads/master i: 267661: fee98b4 267659: 34447d4 267655: 41058f3 267647: 3b73b11 v: v3
git-mirror · Aug 24, 2011 · e42ab3e · e42ab3e
1 parent 2b65da7
commit e42ab3e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 55 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e7650e880b410d0a4c80aa586b5b2f96be3a61
+refs/heads/master: d064307a1a67c564caf69e1555d1aa62662217fb
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.c b/trunk/drivers/staging/rtl8192e/r8192E_phy.c
@@ -1531,44 +1531,13 @@ SetRFPowerState8190(
 	if (bResult) {
 		priv->rtllib->eRFPowerState = eRFPowerState;
 
-		switch (priv->rf_chip )
-		{
-			case RF_8256:
-			switch (priv->rtllib->eRFPowerState)
-			{
-				case eRfOff:
-					if (priv->rtllib->RfOffReason==RF_CHANGE_BY_IPS ) {
-						#ifdef TO_DO
-						dev->HalFunc.LedControlHandler(dev,LED_CTL_NO_LINK);
-						#endif
-					} else {
-						#ifdef TO_DO
-						dev->HalFunc.LedControlHandler(dev, LED_CTL_POWER_OFF);
-						#endif
-					}
-					break;
-
-				case eRfOn:
-					if ( priv->rtllib->state == RTLLIB_LINKED) {
-						#ifdef TO_DO
-						dev->HalFunc.LedControlHandler(dev, LED_CTL_LINK);
-						#endif
-					} else {
-						#ifdef TO_DO
-						dev->HalFunc.LedControlHandler(dev, LED_CTL_NO_LINK);
-						#endif
-					}
-					break;
-
-				default:
-					break;
-			}
-
+		switch (priv->rf_chip) {
+		case RF_8256:
 			break;
 
-			default:
-				RT_TRACE(COMP_ERR, "SetRFPowerState8190(): Unknown RF type\n");
-				break;
+		default:
+			RT_TRACE(COMP_ERR, "SetRFPowerState8190(): Unknown RF type\n");
+			break;
 		}
 	}
 

diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -3974,15 +3974,6 @@ rtllib_MgntDisconnectAP(
 {
 	bool bFilterOutNonAssociatedBSSID = false;
 
-
-#ifdef TO_DO
-	if (   pMgntInfo->SecurityInfo.AuthMode > RT_802_11AuthModeAutoSwitch ||
-		(pMgntInfo->bAPSuportCCKM && pMgntInfo->bCCX8021xenable) )
-	{
-		SecClearAllKeys(rtllib->dev);
-		RT_TRACE(COMP_SEC, DBG_LOUD,("======>CCKM clear key..."))
-	}
-#endif
 	bFilterOutNonAssociatedBSSID = false;
 	rtllib->SetHwRegHandler(rtllib->dev, HW_VAR_CECHK_BSSID, (u8*)(&bFilterOutNonAssociatedBSSID));
 	rtllib_MlmeDisassociateRequest( rtllib, rtllib->current_network.bssid, asRsn );
@@ -4001,15 +3992,6 @@ rtllib_MgntDisconnect(
                 rtllib->sta_wake_up(rtllib->dev);
 	}
 
-#ifdef TO_DO
-	if (pMgntInfo->mActingAsAp)
-	{
-		RT_TRACE(COMP_MLME, DBG_LOUD, ("MgntDisconnect() ===> AP_DisassociateAllStation\n"));
-		AP_DisassociateAllStation(rtllib->dev, unspec_reason);
-		return true;
-	}
-#endif
-
 	if ( rtllib->state == RTLLIB_LINKED )
 	{
 		if ( rtllib->iw_mode == IW_MODE_ADHOC )