Staging: rt3070: remove DOT11_N_SUPPORT ifdefs

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rt3070 / sta / rtmp_data.c

diff --git a/drivers/staging/rt3070/sta/rtmp_data.c b/drivers/staging/rt3070/sta/rtmp_data.c
index 1031a1666dbefb5ac9425df2aa3b0d3ab151b3fd..17b2e203a60572791ec6830d6411de4a21eeab5f 100644 (file)
--- a/drivers/staging/rt3070/sta/rtmp_data.c
+++ b/drivers/staging/rt3070/sta/rtmp_data.c
@@ -185,13 +185,12 @@ VOID STARxDataFrameAnnounce(
        else
        {
                RX_BLK_SET_FLAG(pRxBlk, fRX_EAP);
-#ifdef DOT11_N_SUPPORT
+
                if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMPDU) && (pAd->CommonCfg.bDisableReordering == 0))
                {
                        Indicate_AMPDU_Packet(pAd, pRxBlk, FromWhichBSSID);
                }
                else
-#endif // DOT11_N_SUPPORT //
                {
                        // Determin the destination of the EAP frame
                        //  to WPA state machine or upper layer
@@ -442,12 +441,10 @@ VOID STAHandleRxDataFrame(
                else
 #endif
                {
-#ifdef DOT11_N_SUPPORT
                        RX_BLK_SET_FLAG(pRxBlk, fRX_HTC);
                        // skip HTC contorl field
                        pRxBlk->pData += 4;
                        pRxBlk->DataSize -= 4;
-#endif // DOT11_N_SUPPORT //
                }
        }
 
@@ -460,13 +457,10 @@ VOID STAHandleRxDataFrame(
                pRxBlk->pData += 2;
        }
 
-#ifdef DOT11_N_SUPPORT
        if (pRxD->BA)
        {
                RX_BLK_SET_FLAG(pRxBlk, fRX_AMPDU);
        }
-#endif // DOT11_N_SUPPORT //
-
 
        //
        // Case I  Process Broadcast & Multicast data frame
@@ -608,21 +602,17 @@ VOID STAHandleRxControlFrame(
        IN      PRTMP_ADAPTER   pAd,
        IN      RX_BLK                  *pRxBlk)
 {
-#ifdef DOT11_N_SUPPORT
        PRXWI_STRUC             pRxWI = pRxBlk->pRxWI;
-#endif // DOT11_N_SUPPORT //
        PHEADER_802_11  pHeader = pRxBlk->pHeader;
        PNDIS_PACKET    pRxPacket = pRxBlk->pRxPacket;
 
        switch (pHeader->FC.SubType)
        {
                case SUBTYPE_BLOCK_ACK_REQ:
-#ifdef DOT11_N_SUPPORT
                        {
                                CntlEnqueueForRecv(pAd, pRxWI->WirelessCliID, (pRxWI->MPDUtotalByteCount), (PFRAME_BA_REQ)pHeader);
                        }
                        break;
-#endif // DOT11_N_SUPPORT //
                case SUBTYPE_BLOCK_ACK:
                case SUBTYPE_ACK:
                default:
@@ -1000,10 +990,8 @@ NDIS_STATUS STASendPacket(
                NumberOfFrag = 1;       // Aggregation overwhelms fragmentation
        else if (CLIENT_STATUS_TEST_FLAG(pEntry, fCLIENT_STATUS_AMSDU_INUSED))
                NumberOfFrag = 1;       // Aggregation overwhelms fragmentation
-#ifdef DOT11_N_SUPPORT
        else if ((pAd->StaCfg.HTPhyMode.field.MODE == MODE_HTMIX) || (pAd->StaCfg.HTPhyMode.field.MODE == MODE_HTGREENFIELD))
                NumberOfFrag = 1;       // MIMO RATE overwhelms fragmentation
-#endif // DOT11_N_SUPPORT //
        else
        {
                // The calculated "NumberOfFrag" is a rough estimation because of various
@@ -1104,7 +1092,6 @@ NDIS_STATUS STASendPacket(
        }
        RTMP_IRQ_UNLOCK(&pAd->irq_lock, IrqFlags);
 
-#ifdef DOT11_N_SUPPORT
     if ((pAd->CommonCfg.BACapability.field.AutoBA == TRUE)&&
         IS_HT_STA(pEntry))
        {
@@ -1123,7 +1110,6 @@ NDIS_STATUS STASendPacket(
                        BAOriSessionSetUp(pAd, pEntry, 0, 0, 10, FALSE);
                }
        }
-#endif // DOT11_N_SUPPORT //
 
        pAd->RalinkCounters.OneSecOsTxCount[QueIdx]++; // TODO: for debug only. to be removed
        return NDIS_STATUS_SUCCESS;
@@ -1445,7 +1431,6 @@ VOID STABuildCommon802_11Header(
        pHeader_802_11->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE);
 }
 
-#ifdef DOT11_N_SUPPORT
 VOID STABuildCache802_11Header(
        IN RTMP_ADAPTER         *pAd,
        IN TX_BLK                       *pTxBlk,
@@ -1487,7 +1472,6 @@ VOID STABuildCache802_11Header(
        else
        pHeader80211->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE);
 }
-#endif // DOT11_N_SUPPORT //
 
 static inline PUCHAR STA_Build_ARalink_Frame_Header(
        IN RTMP_ADAPTER *pAd,
@@ -1547,7 +1531,6 @@ static inline PUCHAR STA_Build_ARalink_Frame_Header(
 
 }
 
-#ifdef DOT11_N_SUPPORT
 static inline PUCHAR STA_Build_AMSDU_Frame_Header(
        IN RTMP_ADAPTER *pAd,
        IN TX_BLK               *pTxBlk)
@@ -1869,7 +1852,6 @@ VOID STA_AMSDU_Frame_Tx(
        //
        HAL_KickOutTx(pAd, pTxBlk, pTxBlk->QueIdx);
 }
-#endif // DOT11_N_SUPPORT //
 
 VOID STA_Legacy_Frame_Tx(
        IN      PRTMP_ADAPTER   pAd,
@@ -2380,14 +2362,12 @@ NDIS_STATUS STAHardTransmit(
 
        switch (pTxBlk->TxFrameType)
        {
-#ifdef DOT11_N_SUPPORT
                case TX_AMPDU_FRAME:
                                STA_AMPDU_Frame_Tx(pAd, pTxBlk);
                        break;
                case TX_AMSDU_FRAME:
                                STA_AMSDU_Frame_Tx(pAd, pTxBlk);
                        break;
-#endif // DOT11_N_SUPPORT //
                case TX_LEGACY_FRAME:
                                STA_Legacy_Frame_Tx(pAd, pTxBlk);
                        break;