Signed-off-by: Larry Finger <[email protected]>
---
 drivers/staging/rtl8192e/r8192E_phy.c     |   41 +++-------------------------
 drivers/staging/rtl8192e/rtllib_softmac.c |   18 ------------
 2 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/drivers/staging/rtl8192e/r8192E_phy.c 
b/drivers/staging/rtl8192e/r8192E_phy.c
index 6c2e44f..8224a56 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.c
+++ b/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/drivers/staging/rtl8192e/rtllib_softmac.c 
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 1ce9812..e7c0e66 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/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 )
-- 
1.7.3.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to