Staging: rt3070: remove CONFIG_STA_SUPPORT ifdefs

[safe/jmp/linux-2.6] / drivers / staging / rt3070 / common / cmm_data.c

diff --git a/drivers/staging/rt3070/common/cmm_data.c b/drivers/staging/rt3070/common/cmm_data.c
index 85f92b9..190fe59 100644 (file)
--- a/drivers/staging/rt3070/common/cmm_data.c
+++ b/drivers/staging/rt3070/common/cmm_data.c
@@ -317,8 +317,6 @@ NDIS_STATUS MlmeHardTransmit(
        IN      PNDIS_PACKET    pPacket)
 {
        if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)
-#ifdef CARRIER_DETECTION_SUPPORT
-#endif // CARRIER_DETECTION_SUPPORT //
                )
        {
                return NDIS_STATUS_FAILURE;
@@ -334,8 +332,6 @@ NDIS_STATUS MlmeDataHardTransmit(
        IN      PNDIS_PACKET    pPacket)
 {
        if ((pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)
-#ifdef CARRIER_DETECTION_SUPPORT
-#endif // CARRIER_DETECTION_SUPPORT //
                )
        {
                return NDIS_STATUS_FAILURE;
@@ -381,14 +377,12 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                return NDIS_STATUS_FAILURE;
        }
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // outgoing frame always wakeup PHY to prevent frame lost
                if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
                        AsicForceWakeup(pAd, TRUE);
        }
-#endif // CONFIG_STA_SUPPORT //
 
        pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA +  TXINFO_SIZE);
        pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); //TXWI_SIZE);
@@ -412,7 +406,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                pMacEntry = MacTableLookup(pAd, pHeader_802_11->Addr1);
        }
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                // Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode.
@@ -428,7 +421,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                                pAd->CommonCfg.MlmeTransmit.field.MODE = 0;
                }
        }
-#endif // CONFIG_STA_SUPPORT //
 
        //
        // Should not be hard code to set PwrMgmt to 0 (PWR_ACTIVE)
@@ -438,7 +430,7 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
        // pHeader_802_11->FC.PwrMgmt = 0; // (pAd->StaCfg.Psm == PWR_SAVE);
        //
        // In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame
-#ifdef CONFIG_STA_SUPPORT
+
     // Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD
        if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL))
        {
@@ -448,18 +440,15 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                else
                        pHeader_802_11->FC.PwrMgmt = PWR_ACTIVE;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        bInsertTimestamp = FALSE;
        if (pHeader_802_11->FC.Type == BTYPE_CNTL) // must be PS-POLL
        {
-#ifdef CONFIG_STA_SUPPORT
                //Set PM bit in ps-poll, to fix WLK 1.2  PowerSaveMode_ext failure issue.
                if ((pAd->OpMode == OPMODE_STA) && (pHeader_802_11->FC.SubType == SUBTYPE_PS_POLL))
                {
                        pHeader_802_11->FC.PwrMgmt = PWR_SAVE;
                }
-#endif // CONFIG_STA_SUPPORT //
                bAckRequired = FALSE;
        }
        else // BTYPE_MGMT or BTYPE_DATA(must be NULL frame)
@@ -499,10 +488,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                return (NDIS_STATUS_FAILURE);
        }
 
-#ifdef RT_BIG_ENDIAN
-       RTMPFrameEndianChange(pAd, (PUCHAR)pHeader_802_11, DIR_WRITE, FALSE);
-#endif
-
        //
        // fill scatter-and-gather buffer list into TXD. Internally created NDIS PACKET
        // should always has only one ohysical buffer, and the whole frame size equals
@@ -530,10 +515,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
                                        IFS_BACKOFF, FALSE, &pMacEntry->MaxHTPhyMode);
        }
 
-#ifdef RT_BIG_ENDIAN
-       RTMPWIEndianChange((PUCHAR)pFirstTxWI, TYPE_TXWI);
-#endif
-
        // Now do hardware-depened kick out.
        HAL_KickOutMgmtTx(pAd, QueIdx, pPacket, pSrcBufVA, SrcBufLen);
 
@@ -737,8 +718,6 @@ BOOLEAN RTMP_FillTxBlkInfo(
                        TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired);
 
                {
-
-#ifdef CONFIG_STA_SUPPORT
                        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                        {
 
@@ -750,7 +729,6 @@ BOOLEAN RTMP_FillTxBlkInfo(
 //                             if (pAd->StaCfg.bAutoTxRateSwitch)
 //                                     TX_BLK_SET_FLAG(pTxBlk, fTX_AutoRateSwitch);
                        }
-#endif // CONFIG_STA_SUPPORT //
                }
 
                if (pTxBlk->TxFrameType == TX_LEGACY_FRAME)
@@ -833,13 +811,10 @@ BOOLEAN CanDoAggregateTransmit(
                return FALSE;
        }
 
-#ifdef CONFIG_STA_SUPPORT
        if ((INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA)) // must be unicast to AP
                return TRUE;
        else
-#endif // CONFIG_STA_SUPPORT //
                return FALSE;
-
 }
 
 
@@ -893,10 +868,8 @@ VOID RTMPDeQueuePacket(
        {
                sQIdx = 0;
 //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                eQIdx = 3;      // 4 ACs, start from 0.
-#endif // CONFIG_STA_SUPPORT //
        }
        else
        {
@@ -1016,10 +989,8 @@ VOID RTMPDeQueuePacket(
                        Count += pTxBlk->TxPacketList.Number;
 
                                // Do HardTransmit now.
-#ifdef CONFIG_STA_SUPPORT
                        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                Status = STAHardTransmit(pAd, pTxBlk, QueIdx);
-#endif // CONFIG_STA_SUPPORT //
                }
 
                RT28XX_STOP_DEQUEUE(pAd, QueIdx, IrqFlags);
@@ -1028,15 +999,6 @@ VOID RTMPDeQueuePacket(
                if (!hasTxDesc)
                        RTUSBKickBulkOut(pAd);
 #endif // RT2870 //
-
-#ifdef BLOCK_NET_IF
-               if ((pAd->blockQueueTab[QueIdx].SwTxQueueBlockFlag == TRUE)
-                       && (pAd->TxSwQueue[QueIdx].Number < 1))
-               {
-                       releaseNetIf(&pAd->blockQueueTab[QueIdx]);
-               }
-#endif // BLOCK_NET_IF //
-
        }
 
 }
@@ -1187,10 +1149,6 @@ VOID RTMPWriteTxWI(
 
        // If CCK or OFDM, BW must be 20
        pTxWI->BW = (pTransmit->field.MODE <= MODE_OFDM) ? (BW_20) : (pTransmit->field.BW);
-#ifdef DOT11N_DRAFT3
-       if (pTxWI->BW)
-               pTxWI->BW = (pAd->CommonCfg.AddHTInfo.AddHtInfo.RecomWidth == 0) ? (BW_20) : (pTransmit->field.BW);
-#endif // DOT11N_DRAFT3 //
 
        pTxWI->MCS = pTransmit->field.MCS;
        pTxWI->PHYMODE = pTransmit->field.MODE;
@@ -1262,15 +1220,6 @@ VOID RTMPWriteTxWI_Data(
        pTxWI->ACK              = TX_BLK_TEST_FLAG(pTxBlk, fTX_bAckRequired);
        pTxWI->txop             = pTxBlk->FrameGap;
 
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-       if (pMacEntry &&
-               (pAd->StaCfg.BssType == BSS_INFRA) &&
-               (pMacEntry->ValidAsDls == TRUE))
-               pTxWI->WirelessCliID = BSSID_WCID;
-       else
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
                pTxWI->WirelessCliID            = pTxBlk->Wcid;
 
        pTxWI->MPDUtotalByteCount       = pTxBlk->MpduHeaderLen + pTxBlk->SrcBufLen;
@@ -1279,10 +1228,6 @@ VOID RTMPWriteTxWI_Data(
        // If CCK or OFDM, BW must be 20
        pTxWI->BW = (pTransmit->field.MODE <= MODE_OFDM) ? (BW_20) : (pTransmit->field.BW);
 #ifdef DOT11_N_SUPPORT
-#ifdef DOT11N_DRAFT3
-       if (pTxWI->BW)
-               pTxWI->BW = (pAd->CommonCfg.AddHTInfo.AddHtInfo.RecomWidth == 0) ? (BW_20) : (pTransmit->field.BW);
-#endif // DOT11N_DRAFT3 //
        pTxWI->AMPDU    = ((pTxBlk->TxFrameType == TX_AMPDU_FRAME) ? TRUE : FALSE);
 
        // John tune the performace with Intel Client in 20 MHz performance
@@ -1343,16 +1288,6 @@ VOID RTMPWriteTxWI_Data(
 
        // for rate adapation
        pTxWI->PacketId = pTxWI->MCS;
-#ifdef INF_AMAZON_SE
-/*Iverson patch for WMM A5-T07 ,WirelessStaToWirelessSta do not bulk out aggregate */
-       if( RTMP_GET_PACKET_NOBULKOUT(pTxBlk->pPacket))
-       {
-               if(pTxWI->PHYMODE == MODE_CCK)
-               {
-                       pTxWI->PacketId = 6;
-               }
-       }
-#endif // INF_AMAZON_SE //
 }
 
 
@@ -1393,11 +1328,6 @@ VOID RTMPWriteTxWI_Cache(
        pTxWI->AMPDU = ((pMacEntry->NoBADataCountDown == 0) ? TRUE: FALSE);
        pTxWI->MIMOps = 0;
 
-#ifdef DOT11N_DRAFT3
-       if (pTxWI->BW)
-               pTxWI->BW = (pAd->CommonCfg.AddHTInfo.AddHtInfo.RecomWidth == 0) ? (BW_20) : (pTransmit->field.BW);
-#endif // DOT11N_DRAFT3 //
-
        if (pAd->CommonCfg.bMIMOPSEnable)
        {
                // MIMO Power Save Mode
@@ -1746,7 +1676,6 @@ UINT deaggregate_AMSDU_announce(
                // convert to 802.3 header
         CONVERT_TO_802_3(Header802_3, pDA, pSA, pPayload, PayloadSize, pRemovedLLCSNAP);
 
-#ifdef CONFIG_STA_SUPPORT
                if ((Header802_3[12] == 0x88) && (Header802_3[13] == 0x8E) )
                {
                    // avoid local heap overflow, use dyanamic allocation
@@ -1756,9 +1685,7 @@ UINT deaggregate_AMSDU_announce(
                   WpaEAPOLKeyAction(pAd, Elem);
                   kfree(Elem);
                }
-#endif // CONFIG_STA_SUPPORT //
 
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                {
                        if (pRemovedLLCSNAP)
@@ -1768,15 +1695,12 @@ UINT deaggregate_AMSDU_announce(
                                NdisMoveMemory(pPayload, &Header802_3[0], LENGTH_802_3);
                        }
                }
-#endif // CONFIG_STA_SUPPORT //
 
                pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize);
                if (pClonePacket)
                {
-#ifdef CONFIG_STA_SUPPORT
                        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket));
-#endif // CONFIG_STA_SUPPORT //
                }
 
 
@@ -1874,11 +1798,11 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
                return NULL;
 
        FirstWcid = 1;
-#ifdef CONFIG_STA_SUPPORT
+
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
+
        if (pAd->StaCfg.BssType == BSS_INFRA)
                FirstWcid = 2;
-#endif // CONFIG_STA_SUPPORT //
 
        // allocate one MAC entry
        NdisAcquireSpinLock(&pAd->MacTabLock);
@@ -1889,11 +1813,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
                        (pAd->MacTab.Content[i].ValidAsWDS == FALSE) &&
                        (pAd->MacTab.Content[i].ValidAsApCli== FALSE) &&
                        (pAd->MacTab.Content[i].ValidAsMesh == FALSE)
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-                       && (pAd->MacTab.Content[i].ValidAsDls == FALSE)
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
                        )
                {
                        pEntry = &pAd->MacTab.Content[i];
@@ -1905,23 +1824,7 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
                                pEntry->PairwiseKey.KeyLen = 0;
                                pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;
                        }
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-                       if (apidx >= MIN_NET_DEVICE_FOR_DLS)
-                       {
-                               pEntry->ValidAsCLI = FALSE;
-                               pEntry->ValidAsWDS = FALSE;
-                               pEntry->ValidAsApCli = FALSE;
-                               pEntry->ValidAsMesh = FALSE;
-                               pEntry->ValidAsDls = TRUE;
-                               pEntry->isCached = FALSE;
-                       }
-                       else
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
                        {
-
-#ifdef CONFIG_STA_SUPPORT
                                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                {
                                        pEntry->ValidAsCLI = TRUE;
@@ -1930,7 +1833,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
                                        pEntry->ValidAsMesh = FALSE;
                                        pEntry->ValidAsDls = FALSE;
                                }
-#endif // CONFIG_STA_SUPPORT //
                        }
 
                        pEntry->bIAmBadAtheros = FALSE;
@@ -1947,37 +1849,21 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
                                pEntry->apidx = (apidx - MIN_NET_DEVICE_FOR_APCLI);
                        else if (pEntry->ValidAsWDS)
                                pEntry->apidx = (apidx - MIN_NET_DEVICE_FOR_WDS);
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-                       else if (pEntry->ValidAsDls)
-                               pEntry->apidx = (apidx - MIN_NET_DEVICE_FOR_DLS);
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
                        else
                                pEntry->apidx = apidx;
 
                        {
-
-#ifdef CONFIG_STA_SUPPORT
                                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                                {
                                        pEntry->AuthMode = pAd->StaCfg.AuthMode;
                                        pEntry->WepStatus = pAd->StaCfg.WepStatus;
                                        pEntry->PrivacyFilter = Ndis802_11PrivFilterAcceptAll;
                                }
-#endif // CONFIG_STA_SUPPORT //
                        }
 
                        pEntry->GTKState = REKEY_NEGOTIATING;
                        pEntry->PairwiseKey.KeyLen = 0;
                        pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-                       if (pEntry->ValidAsDls == TRUE)
-                               pEntry->PortSecured = WPA_802_1X_PORT_SECURED;
-                       else
-#endif //QOS_DLS_SUPPORT
-#endif // CONFIG_STA_SUPPORT //
                        pEntry->PortSecured = WPA_802_1X_PORT_NOT_SECURED;
                        pEntry->PMKID_CacheIdx = ENTRY_NOT_FOUND;
                        COPY_MAC_ADDR(pEntry->Addr, pAddr);
@@ -2052,11 +1938,6 @@ BOOLEAN MacTableDeleteEntry(
        pEntry = &pAd->MacTab.Content[wcid];
 
        if (pEntry && (pEntry->ValidAsCLI || pEntry->ValidAsApCli || pEntry->ValidAsWDS || pEntry->ValidAsMesh
-#ifdef CONFIG_STA_SUPPORT
-#ifdef QOS_DLS_SUPPORT
-               || pEntry->ValidAsDls
-#endif // QOS_DLS_SUPPORT //
-#endif // CONFIG_STA_SUPPORT //
                ))
        {
                if (MAC_ADDR_EQUAL(pEntry->Addr, pAddr))
@@ -2114,7 +1995,7 @@ BOOLEAN MacTableDeleteEntry(
                }
                else
                {
-                       printk("\n%s: Impossible Wcid = %d !!!!!\n", __FUNCTION__, wcid);
+                       printk("\n%s: Impossible Wcid = %d !!!!!\n", __func__, wcid);
                }
        }
 
@@ -2466,10 +2347,8 @@ VOID Indicate_Legacy_Packet(
        // 2. remove LLC
        //              a. pointer pRxBlk->pData to payload
        //      b. modify pRxBlk->DataSize
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
-#endif // CONFIG_STA_SUPPORT //
 
        if (pRxBlk->DataSize > MAX_RX_PKT_LEN)
        {
@@ -2520,11 +2399,8 @@ VOID Indicate_Legacy_Packet(
        //
        // pass this 802.3 packet to upper layer or forward this packet to WM directly
        //
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID);
-#endif // CONFIG_STA_SUPPORT //
-
 }
 
 
@@ -2587,11 +2463,8 @@ VOID CmmRxRalinkFrameIndicate(
        }
 
        // get 802.3 Header and  remove LLC
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
-#endif // CONFIG_STA_SUPPORT //
-
 
        ASSERT(pRxBlk->pRxPacket);
 
@@ -2601,10 +2474,9 @@ VOID CmmRxRalinkFrameIndicate(
        Payload2Size = Msdu2Size - LENGTH_802_3;
 
        pData2 = pRxBlk->pData + Payload1Size + LENGTH_802_3;
-#ifdef CONFIG_STA_SUPPORT
+
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                pPacket2 = duplicate_pkt(pAd, (pData2-LENGTH_802_3), LENGTH_802_3, pData2, Payload2Size, FromWhichBSSID);
-#endif // CONFIG_STA_SUPPORT //
 
        if (!pPacket2)
        {
@@ -2617,17 +2489,13 @@ VOID CmmRxRalinkFrameIndicate(
        pRxBlk->DataSize = Payload1Size;
        wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID);
 
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxBlk->pRxPacket, FromWhichBSSID);
-#endif // CONFIG_STA_SUPPORT //
 
        if (pPacket2)
        {
-#ifdef CONFIG_STA_SUPPORT
                IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                        ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);
-#endif // CONFIG_STA_SUPPORT //
        }
 }
 
@@ -2770,15 +2638,12 @@ VOID Indicate_EAPOL_Packet(
 {
        MAC_TABLE_ENTRY *pEntry = NULL;
 
-
-#ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
        {
                pEntry = &pAd->MacTab.Content[BSSID_WCID];
                STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID);
                return;
        }
-#endif // CONFIG_STA_SUPPORT //
 
        if (pEntry == NULL)
        {