Staging: rt2860: remove CONFIG_STA_SUPPORT ifdefs

[linux-2.6-microblaze.git] / drivers / staging / rt2860 / common / mlme.c

diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index e0c39e2..8dbbd28 100644 (file)
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -50,11 +50,9 @@ UCHAR        Ccx2QosInfo[] = {0x00, 0x40, 0x96, 0x04};
 UCHAR   RALINK_OUI[]  = {0x00, 0x0c, 0x43};
 UCHAR   BROADCOM_OUI[]  = {0x00, 0x90, 0x4c};
 UCHAR   WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04};
-#ifdef CONFIG_STA_SUPPORT
 #ifdef DOT11_N_SUPPORT
 UCHAR  PRE_N_HT_OUI[]  = {0x00, 0x90, 0x4c};
 #endif // DOT11_N_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
 
 UCHAR RateSwitchTable[] = {
 // Item No.   Mode   Curr-MCS   TrainUp   TrainDown            // Mode- Bit0: STBC, Bit1: Short GI, Bit4,5: Mode(0:CCK, 1:OFDM, 2:HT Mix, 3:HT GF)
@@ -485,7 +483,6 @@ NDIS_STATUS MlmeInit(
                pAd->Mlme.bRunning = FALSE;
                NdisAllocateSpinLock(&pAd->Mlme.TaskLock);
 
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        BssTableInit(&pAd->ScanTab);
@@ -502,9 +499,6 @@ NDIS_STATUS MlmeInit(
                        // state machine init
                        MlmeCntlInit(pAd, &pAd->Mlme.CntlMachine, NULL);
                }
-#endif // CONFIG_STA_SUPPORT //
-
-
 
                ActionStateMachineInit(pAd, &pAd->Mlme.ActMachine, pAd->Mlme.ActFunc);
 
@@ -517,8 +511,6 @@ NDIS_STATUS MlmeInit(
                // software-based RX Antenna diversity
                RTMPInitTimer(pAd, &pAd->Mlme.RxAntEvalTimer, GET_TIMER_FUNCTION(AsicRxAntEvalTimeout), pAd, FALSE);
 
-
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE))
@@ -528,8 +520,6 @@ NDIS_STATUS MlmeInit(
                        RTMPInitTimer(pAd, &pAd->Mlme.RadioOnOffTimer, GET_TIMER_FUNCTION(RadioOnExec), pAd, FALSE);
                }
                }
-#endif // CONFIG_STA_SUPPORT //
-
        } while (FALSE);
 
        DBGPRINT(RT_DEBUG_TRACE, ("<-- MLME Initialize\n"));
@@ -589,7 +579,6 @@ VOID MlmeHandler(
                        switch (Elem->Machine)
                        {
                                // STA state machines
-#ifdef CONFIG_STA_SUPPORT
                                case ASSOC_STATE_MACHINE:
                                        StateMachinePerformAction(pAd, &pAd->Mlme.AssocMachine, Elem);
                                        break;
@@ -611,8 +600,6 @@ VOID MlmeHandler(
                                case AIRONET_STATE_MACHINE:
                                        StateMachinePerformAction(pAd, &pAd->Mlme.AironetMachine, Elem);
                                        break;
-#endif // CONFIG_STA_SUPPORT //
-
                                case ACTION_STATE_MACHINE:
                                        StateMachinePerformAction(pAd, &pAd->Mlme.ActMachine, Elem);
                                        break;
@@ -666,7 +653,6 @@ VOID MlmeHalt(
                AsicDisableSync(pAd);
        }
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Cancel pending timers
@@ -682,7 +668,6 @@ VOID MlmeHalt(
                    RTMPCancelTimer(&pAd->Mlme.RadioOnOffTimer,         &Cancelled);
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        RTMPCancelTimer(&pAd->Mlme.PeriodicTimer,               &Cancelled);
        RTMPCancelTimer(&pAd->Mlme.RxAntEvalTimer,              &Cancelled);
@@ -777,7 +762,6 @@ VOID MlmePeriodicExec(
                pAd->StaCfg.WpaSupplicantUP = 1;
        }
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
            // If Hardware controlled Radio enabled, we have to check GPIO pin2 every 2 second.
@@ -818,7 +802,6 @@ VOID MlmePeriodicExec(
                        }
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // Do nothing if the driver is starting halt state.
        // This might happen when timer already been fired before cancel timer with mlmehalt
@@ -869,7 +852,6 @@ VOID MlmePeriodicExec(
 
        RT28XX_MLME_PRE_SANITY_CHECK(pAd);
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Do nothing if monitor mode is on
@@ -895,7 +877,6 @@ VOID MlmePeriodicExec(
                                }
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        pAd->bUpdateBcnCntDone = FALSE;
 
@@ -905,7 +886,6 @@ VOID MlmePeriodicExec(
        // execute every 500ms
        if ((pAd->Mlme.PeriodicRound % 5 == 0) && RTMPAutoRateSwitchCheck(pAd)/*(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_TX_RATE_SWITCH_ENABLED))*/)
        {
-#ifdef CONFIG_STA_SUPPORT
                // perform dynamic tx rate switching based on past TX history
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
@@ -914,7 +894,6 @@ VOID MlmePeriodicExec(
                                && (!OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)))
                                MlmeDynamicTxRateSwitching(pAd);
                }
-#endif // CONFIG_STA_SUPPORT //
        }
 
        // Normal 1 second Mlme PeriodicExec.
@@ -983,14 +962,11 @@ VOID MlmePeriodicExec(
                        }
                }
 
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                        STAMlmePeriodicExec(pAd);
-#endif // CONFIG_STA_SUPPORT //
 
                MlmeResetRalinkCounters(pAd);
 
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST) && (pAd->bPCIclkOff == FALSE))
@@ -1015,7 +991,6 @@ VOID MlmePeriodicExec(
                                }
                        }
                }
-#endif // CONFIG_STA_SUPPORT //
 
                RT28XX_MLME_HANDLER(pAd);
        }
@@ -1024,7 +999,6 @@ VOID MlmePeriodicExec(
        pAd->bUpdateBcnCntDone = FALSE;
 }
 
-#ifdef CONFIG_STA_SUPPORT
 VOID STAMlmePeriodicExec(
        PRTMP_ADAPTER pAd)
 {
@@ -1365,7 +1339,6 @@ VOID MlmeAutoReconnectLastSSID(
                RT28XX_MLME_HANDLER(pAd);
        }
 }
-#endif // CONFIG_STA_SUPPORT //
 
 /*
        ==========================================================================
@@ -1414,7 +1387,6 @@ VOID MlmeSelectTxRateTable(
                        break;
                }
 
-#ifdef CONFIG_STA_SUPPORT
                if ((pAd->OpMode == OPMODE_STA) && ADHOC_ON(pAd))
                {
 #ifdef DOT11_N_SUPPORT
@@ -1483,7 +1455,6 @@ VOID MlmeSelectTxRateTable(
                        }
                        break;
                }
-#endif // CONFIG_STA_SUPPORT //
 
 #ifdef DOT11_N_SUPPORT
                if ((pEntry->RateLen == 12) && (pEntry->HTCapability.MCSSet[0] == 0xff) &&
@@ -1587,7 +1558,6 @@ VOID MlmeSelectTxRateTable(
 #ifdef DOT11_N_SUPPORT
 #endif // DOT11_N_SUPPORT //
 
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
 #ifdef DOT11_N_SUPPORT
@@ -1655,11 +1625,9 @@ VOID MlmeSelectTxRateTable(
                        DBGPRINT_RAW(RT_DEBUG_ERROR,("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n",
                                pAd->StaActive.SupRateLen, pAd->StaActive.ExtRateLen, pAd->StaActive.SupportedPhyInfo.MCSSet[0], pAd->StaActive.SupportedPhyInfo.MCSSet[1]));
                }
-#endif // CONFIG_STA_SUPPORT //
        } while(FALSE);
 }
 
-#ifdef CONFIG_STA_SUPPORT
 /*
        ==========================================================================
        Description:
@@ -2755,8 +2723,6 @@ VOID MlmeSetPsmBit(
        RTMP_IO_WRITE32(pAd, AUTO_RSP_CFG, csr4.word);
        DBGPRINT(RT_DEBUG_TRACE, ("MlmeSetPsmBit = %d\n", psm));
 }
-#endif // CONFIG_STA_SUPPORT //
-
 
 // IRQL = DISPATCH_LEVEL
 VOID MlmeSetTxPreamble(
@@ -2895,8 +2861,6 @@ VOID MlmeUpdateTxRates(
 
 //===========================================================================
 //===========================================================================
-
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                pHtPhy          = &pAd->StaCfg.HTPhyMode;
@@ -2913,7 +2877,6 @@ VOID MlmeUpdateTxRates(
                        MaxDesire = RATE_11;
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        pAd->CommonCfg.MaxDesiredRate = MaxDesire;
        pMinHtPhy->word = 0;
@@ -2942,7 +2905,6 @@ VOID MlmeUpdateTxRates(
        }
 #endif
 
-#ifdef CONFIG_STA_SUPPORT
        if ((ADHOC_ON(pAd) || INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA))
        {
                pSupRate = &pAd->StaActive.SupRate[0];
@@ -2951,7 +2913,6 @@ VOID MlmeUpdateTxRates(
                ExtRateLen = pAd->StaActive.ExtRateLen;
        }
        else
-#endif // CONFIG_STA_SUPPORT //
        {
                pSupRate = &pAd->CommonCfg.SupRate[0];
                pExtRate = &pAd->CommonCfg.ExtRate[0];
@@ -3028,10 +2989,10 @@ VOID MlmeUpdateTxRates(
        if (*auto_rate_cur_p)
        {
                short dbm = 0;
-#ifdef CONFIG_STA_SUPPORT
+
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                        dbm = pAd->StaCfg.RssiSample.AvgRssi0 - pAd->BbpRssiToDbmDelta;
-#endif // CONFIG_STA_SUPPORT //
+
                if (bLinkUp == TRUE)
                        pAd->CommonCfg.TxRate = RATE_24;
                else
@@ -3190,7 +3151,6 @@ VOID MlmeUpdateHtTxRates(
 
        auto_rate_cur_p = NULL;
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                pDesireHtPhy    = &pAd->StaCfg.DesiredHtPhyInfo;
@@ -3201,9 +3161,7 @@ VOID MlmeUpdateHtTxRates(
 
                auto_rate_cur_p = &pAd->StaCfg.bAutoTxRateSwitch;
        }
-#endif // CONFIG_STA_SUPPORT //
 
-#ifdef CONFIG_STA_SUPPORT
        if ((ADHOC_ON(pAd) || INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA))
        {
                if (pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE)
@@ -3219,7 +3177,6 @@ VOID MlmeUpdateHtTxRates(
                        pMaxHtPhy->field.STBC = STBC_NONE;
        }
        else
-#endif // CONFIG_STA_SUPPORT //
        {
                if (pDesireHtPhy->bHtEnable == FALSE)
                        return;
@@ -3270,7 +3227,6 @@ VOID MlmeUpdateHtTxRates(
        pMinHtPhy->field.STBC = 0;
        pMinHtPhy->field.ShortGI = 0;
        //If STA assigns fixed rate. update to fixed here.
-#ifdef CONFIG_STA_SUPPORT
        if ( (pAd->OpMode == OPMODE_STA) && (pDesireHtPhy->MCSSet[0] != 0xff))
        {
                if (pDesireHtPhy->MCSSet[4] != 0)
@@ -3294,8 +3250,6 @@ VOID MlmeUpdateHtTxRates(
                                break;
                }
        }
-#endif // CONFIG_STA_SUPPORT //
-
 
        // Decide ht rate
        pHtPhy->field.STBC = pMaxHtPhy->field.STBC;
@@ -3677,7 +3631,6 @@ VOID BssEntrySet(
        else
                pBss->QbssLoad.bValid = FALSE;
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                PEID_STRUCT     pEid;
@@ -3722,7 +3675,6 @@ VOID BssEntrySet(
                        pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len);
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 }
 
 /*!
@@ -3824,7 +3776,6 @@ ULONG BssTableSetEntry(
        return Idx;
 }
 
-#ifdef CONFIG_STA_SUPPORT
 // IRQL = DISPATCH_LEVEL
 VOID BssTableSsidSort(
        IN      PRTMP_ADAPTER   pAd,
@@ -4079,8 +4030,6 @@ VOID BssTableSortByRssi(
                }
        }
 }
-#endif // CONFIG_STA_SUPPORT //
-
 
 VOID BssCipherParse(
        IN OUT  PBSS_ENTRY      pBss)
@@ -4484,10 +4433,10 @@ VOID MgtMacHeaderInit(
        pHdr80211->FC.SubType = SubType;
        pHdr80211->FC.ToDs = ToDs;
        COPY_MAC_ADDR(pHdr80211->Addr1, pDA);
-#ifdef CONFIG_STA_SUPPORT
+
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                COPY_MAC_ADDR(pHdr80211->Addr2, pAd->CurrentAddress);
-#endif // CONFIG_STA_SUPPORT //
+
        COPY_MAC_ADDR(pHdr80211->Addr3, pBssid);
 }
 
@@ -4694,7 +4643,6 @@ BOOLEAN MlmeEnqueueForRecv(
                return FALSE;
        }
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (!MsgTypeSubst(pAd, pFrame, &Machine, &MsgType))
@@ -4703,7 +4651,6 @@ BOOLEAN MlmeEnqueueForRecv(
                        return FALSE;
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // OK, we got all the informations, it is time to put things into queue
        NdisAcquireSpinLock(&(Queue->Lock));
@@ -4772,9 +4719,7 @@ VOID      MlmeRestartStateMachine(
        IN      PRTMP_ADAPTER   pAd)
 {
        MLME_QUEUE_ELEM         *Elem = NULL;
-#ifdef CONFIG_STA_SUPPORT
        BOOLEAN                         Cancelled;
-#endif // CONFIG_STA_SUPPORT //
 
        DBGPRINT(RT_DEBUG_TRACE, ("MlmeRestartStateMachine \n"));
 
@@ -4806,7 +4751,6 @@ VOID      MlmeRestartStateMachine(
                }
        }
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Cancel all timer events
@@ -4818,7 +4762,6 @@ VOID      MlmeRestartStateMachine(
                RTMPCancelTimer(&pAd->MlmeAux.BeaconTimer,         &Cancelled);
                RTMPCancelTimer(&pAd->MlmeAux.ScanTimer,           &Cancelled);
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // Change back to original channel in case of doing scan
        AsicSwitchChannel(pAd, pAd->CommonCfg.Channel, FALSE);
@@ -4827,7 +4770,6 @@ VOID      MlmeRestartStateMachine(
        // Resume MSDU which is turned off durning scan
        RTMPResumeMsduTransmission(pAd);
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Set all state machines back IDLE
@@ -4838,7 +4780,6 @@ VOID      MlmeRestartStateMachine(
                pAd->Mlme.SyncMachine.CurrState    = SYNC_IDLE;
                pAd->Mlme.ActMachine.CurrState    = ACT_IDLE;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        // Remove running state
        NdisAcquireSpinLock(&pAd->Mlme.TaskLock);
@@ -4921,7 +4862,6 @@ VOID MlmeQueueDestroy(
  IRQL = DISPATCH_LEVEL
 
  */
-#ifdef CONFIG_STA_SUPPORT
 BOOLEAN MsgTypeSubst(
        IN PRTMP_ADAPTER  pAd,
        IN PFRAME_802_11 pFrame,
@@ -5031,7 +4971,6 @@ BOOLEAN MsgTypeSubst(
 
        return TRUE;
 }
-#endif // CONFIG_STA_SUPPORT //
 
 // ===========================================================================================
 // state_machine.c
@@ -6148,7 +6087,6 @@ VOID AsicAdjustTxPower(
 
 }
 
-#ifdef CONFIG_STA_SUPPORT
 /*
        ==========================================================================
        Description:
@@ -6199,7 +6137,7 @@ VOID AsicForceWakeup(
     DBGPRINT(RT_DEBUG_TRACE, ("--> AsicForceWakeup \n"));
     RT28XX_STA_FORCE_WAKEUP(pAd, Level);
 }
-#endif // CONFIG_STA_SUPPORT //
+
 /*
        ==========================================================================
        Description:
@@ -6371,7 +6309,7 @@ VOID AsicEnableBssSync(
        DBGPRINT(RT_DEBUG_TRACE, ("--->AsicEnableBssSync(INFRA mode)\n"));
 
        RTMP_IO_READ32(pAd, BCN_TIME_CFG, &csr.word);
-#ifdef CONFIG_STA_SUPPORT
+
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                csr.field.BeaconInterval = pAd->CommonCfg.BeaconPeriod << 4; // ASIC register in units of 1/16 TU
@@ -6380,7 +6318,7 @@ VOID AsicEnableBssSync(
                csr.field.bBeaconGen  = 0; // do NOT generate BEACON
                csr.field.bTBTTEnable = 1;
        }
-#endif // CONFIG_STA_SUPPORT //
+
        RTMP_IO_WRITE32(pAd, BCN_TIME_CFG, csr.word);
 }
 
@@ -6575,7 +6513,7 @@ VOID AsicSetEdcaParm(
                Ac2Cfg.field.Cwmin = pEdcaParm->Cwmin[QID_AC_VI];
                Ac2Cfg.field.Cwmax = pEdcaParm->Cwmax[QID_AC_VI];
                Ac2Cfg.field.Aifsn = pEdcaParm->Aifsn[QID_AC_VI];
-#ifdef CONFIG_STA_SUPPORT
+
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        // Tuning for Wi-Fi WMM S06
@@ -6592,7 +6530,6 @@ VOID AsicSetEdcaParm(
                                Ac2Cfg.field.AcTxop = 5;
                        }
                }
-#endif // CONFIG_STA_SUPPORT //
 
                Ac3Cfg.field.AcTxop = pEdcaParm->Txop[QID_AC_VO];
                Ac3Cfg.field.Cwmin = pEdcaParm->Cwmin[QID_AC_VO];
@@ -6634,10 +6571,10 @@ VOID AsicSetEdcaParm(
                CwminCsr.field.Cwmin0 = pEdcaParm->Cwmin[QID_AC_BE];
                CwminCsr.field.Cwmin1 = pEdcaParm->Cwmin[QID_AC_BK];
                CwminCsr.field.Cwmin2 = pEdcaParm->Cwmin[QID_AC_VI];
-#ifdef CONFIG_STA_SUPPORT
+
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                        CwminCsr.field.Cwmin3 = pEdcaParm->Cwmin[QID_AC_VO] - 1; //for TGn wifi test
-#endif // CONFIG_STA_SUPPORT //
+
                RTMP_IO_WRITE32(pAd, WMM_CWMIN_CFG, CwminCsr.word);
 
                CwmaxCsr.word = 0;
@@ -6651,7 +6588,7 @@ VOID AsicSetEdcaParm(
                AifsnCsr.field.Aifsn0 = Ac0Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_BE];
                AifsnCsr.field.Aifsn1 = Ac1Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_BK];
                AifsnCsr.field.Aifsn2 = Ac2Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_VI];
-#ifdef CONFIG_STA_SUPPORT
+
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        // Tuning for Wi-Fi WMM S06
@@ -6668,12 +6605,10 @@ VOID AsicSetEdcaParm(
                                AifsnCsr.field.Aifsn2 = 7;
                        }
                }
-#endif // CONFIG_STA_SUPPORT //
 
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                        AifsnCsr.field.Aifsn3 = Ac3Cfg.field.Aifsn - 1; //pEdcaParm->Aifsn[QID_AC_VO]; //for TGn wifi test
-#endif // CONFIG_STA_SUPPORT //
+
                RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, AifsnCsr.word);
 
                NdisMoveMemory(&pAd->CommonCfg.APEdcaParm, pEdcaParm, sizeof(EDCA_PARM));
@@ -6724,10 +6659,8 @@ VOID     AsicSetSlotTime(
        ULONG   SlotTime;
        UINT32  RegValue = 0;
 
-#ifdef CONFIG_STA_SUPPORT
        if (pAd->CommonCfg.Channel > 14)
                bUseShortSlotTime = TRUE;
-#endif // CONFIG_STA_SUPPORT //
 
        if (bUseShortSlotTime)
                OPSTATUS_SET_FLAG(pAd, fOP_STATUS_SHORT_SLOT_INUSED);
@@ -6736,7 +6669,6 @@ VOID      AsicSetSlotTime(
 
        SlotTime = (bUseShortSlotTime)? 9 : 20;
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // force using short SLOT time for FAE to demo performance when TxBurst is ON
@@ -6752,20 +6684,17 @@ VOID    AsicSetSlotTime(
                else if (pAd->CommonCfg.bEnableTxBurst)
                        SlotTime = 9;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        //
        // For some reasons, always set it to short slot time.
        //
        // ToDo: Should consider capability with 11B
        //
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (pAd->StaCfg.BssType == BSS_ADHOC)
                        SlotTime = 20;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        RTMP_IO_READ32(pAd, BKOFF_SLOT_CFG, &RegValue);
        RegValue = RegValue & 0xFFFFFF00;
@@ -7387,7 +7316,6 @@ VOID      RTMPCheckRates(
        NdisMoveMemory(SupRate, NewRate, NewRateLen);
 }
 
-#ifdef CONFIG_STA_SUPPORT
 #ifdef DOT11_N_SUPPORT
 BOOLEAN RTMPCheckChannel(
        IN PRTMP_ADAPTER pAd,
@@ -7535,7 +7463,6 @@ BOOLEAN   RTMPCheckHt(
        return TRUE;
 }
 #endif // DOT11_N_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
 
 /*
        ========================================================================
@@ -7719,7 +7646,6 @@ VOID AsicEvaluateRxAnt(
 {
        UCHAR   BBPR3 = 0;
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS |
@@ -7732,7 +7658,6 @@ VOID AsicEvaluateRxAnt(
                if (pAd->StaCfg.Psm == PWR_SAVE)
                        return;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R3, &BBPR3);
        BBPR3 &= (~0x18);
@@ -7749,10 +7674,10 @@ VOID AsicEvaluateRxAnt(
                BBPR3 |= (0x0);
        }
        RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3);
-#ifdef CONFIG_STA_SUPPORT
+
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        pAd->StaCfg.BBPR3 = BBPR3;
-#endif // CONFIG_STA_SUPPORT //
+
        if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED)
                )
        {
@@ -7793,12 +7718,9 @@ VOID AsicRxAntEvalTimeout(
        IN PVOID SystemSpecific3)
 {
        RTMP_ADAPTER    *pAd = (RTMP_ADAPTER *)FunctionContext;
-#ifdef CONFIG_STA_SUPPORT
        UCHAR                   BBPR3 = 0;
        CHAR                    larger = -127, rssi0, rssi1, rssi2;
-#endif // CONFIG_STA_SUPPORT //
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)        ||
@@ -7859,9 +7781,6 @@ VOID AsicRxAntEvalTimeout(
                RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3);
                pAd->StaCfg.BBPR3 = BBPR3;
        }
-
-#endif // CONFIG_STA_SUPPORT //
-
 }
 
 
@@ -7928,8 +7847,6 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
 {
        BOOLEAN         result = TRUE;
 
-
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // only associated STA counts
@@ -7940,9 +7857,6 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
                else
                        result = FALSE;
        }
-#endif // CONFIG_STA_SUPPORT //
-
-
 
        return result;
 }
@@ -7951,14 +7865,12 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
 BOOLEAN RTMPAutoRateSwitchCheck(
        IN PRTMP_ADAPTER    pAd)
 {
-
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                if (pAd->StaCfg.bAutoTxRateSwitch)
                        return TRUE;
        }
-#endif // CONFIG_STA_SUPPORT //
+
        return FALSE;
 }
 
@@ -7984,13 +7896,10 @@ UCHAR RTMPStaFixedTxMode(
 {
        UCHAR   tx_mode = FIXED_TXMODE_HT;
 
-
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                tx_mode = (UCHAR)pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        return tx_mode;
 }
@@ -8047,7 +7956,6 @@ VOID RTMPUpdateLegacyTxSetting(
        }
 }
 
-#ifdef CONFIG_STA_SUPPORT
 /*
        ==========================================================================
        Description:
@@ -8254,7 +8162,6 @@ VOID AsicResetPBF(
                DBGPRINT(RT_DEBUG_TRACE, ("<---  Asic HardReset PBF !!!! \n"));
        }
 }
-#endif // CONFIG_STA_SUPPORT //
 
 VOID RTMPSetAGCInitValue(
        IN PRTMP_ADAPTER        pAd,