1 files changed, 6 insertions, 23 deletions

diff --git a/drivers/staging/rt2870/sta/sync.c b/drivers/staging/rt2870/sta/sync.c
index a489ebc0878..7533b9d0480 100644
--- a/drivers/staging/rt2870/sta/sync.c
+++ b/drivers/staging/rt2870/sta/sync.c
@@ -108,7 +108,6 @@ VOID BeaconTimeout(
         if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS))
                 return;
 
-#ifdef DOT11_N_SUPPORT
         if ((pAd->CommonCfg.BBPCurrentBW == BW_40)
                 )
         {
@@ -121,7 +120,6 @@ VOID BeaconTimeout(
                 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue);
                 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - End of SCAN, restore to 40MHz channel %d, Total BSS[%02d]\n",pAd->CommonCfg.CentralChannel, pAd->ScanTab.BssNr));
         }
-#endif // DOT11_N_SUPPORT //
 
         MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_BEACON_TIMEOUT, 0, NULL);
         RT28XX_MLME_HANDLER(pAd);
@@ -475,7 +473,7 @@ VOID MlmeStartReqAction(
                 pAd->MlmeAux.ExtRateLen = pAd->CommonCfg.ExtRateLen;
                 NdisMoveMemory(pAd->MlmeAux.ExtRate, pAd->CommonCfg.ExtRate, MAX_LEN_OF_SUPPORTED_RATES);
                 RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen);
-#ifdef DOT11_N_SUPPORT
+
                 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
                 {
                         RTMPUpdateHTIE(&pAd->CommonCfg.DesiredHtPhy, &pAd->StaCfg.DesiredHtPhyInfo.MCSSet[0], &pAd->MlmeAux.HtCapability, &pAd->MlmeAux.AddHtInfo);
@@ -484,7 +482,6 @@ VOID MlmeStartReqAction(
                         DBGPRINT(RT_DEBUG_TRACE, ("SYNC -pAd->StaActive.SupportedHtPhy.bHtEnable = TRUE\n"));
                 }
                 else
-#endif // DOT11_N_SUPPORT //
                 {
                         pAd->MlmeAux.HtCapabilityLen = 0;
                         pAd->StaActive.SupportedPhyInfo.bHtEnable = FALSE;
@@ -554,10 +551,9 @@ VOID PeerBeaconAtScanAction(
         // Init Variable IE structure
         pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE;
         pVIE->Length = 0;
-#ifdef DOT11_N_SUPPORT
+
     RTMPZeroMemory(&HtCapability, sizeof(HtCapability));
         RTMPZeroMemory(&AddHtInfo, sizeof(ADD_HT_INFO_IE));
-#endif // DOT11_N_SUPPORT //
 
         if (PeerBeaconAndProbeRspSanity(pAd,
                                                                 Elem->Msg,
@@ -608,11 +604,9 @@ VOID PeerBeaconAtScanAction(
 
                 Rssi = RTMPMaxRssi(pAd, ConvertToRssi(pAd, Elem->Rssi0, RSSI_0), ConvertToRssi(pAd, Elem->Rssi1, RSSI_1), ConvertToRssi(pAd, Elem->Rssi2, RSSI_2));
 
-
-#ifdef DOT11_N_SUPPORT
                 if ((HtCapabilityLen > 0) || (PreNHtCapabilityLen > 0))
                         HtCapabilityLen = SIZE_HT_CAP_IE;
-#endif // DOT11_N_SUPPORT //
+
                 if ((pAd->StaCfg.CCXReqType != MSRN_TYPE_UNUSED) && (Channel == pAd->StaCfg.CCXScanChannel))
                 {
                         Idx = BssTableSetEntry(pAd, &pAd->StaCfg.CCXBssTab, Bssid, Ssid, SsidLen, BssType, BeaconPeriod,
@@ -682,9 +676,7 @@ VOID PeerBeaconAtJoinAction(
         UCHAR                           HtCapabilityLen = 0, PreNHtCapabilityLen = 0;
         UCHAR                   AddHtInfoLen;
         UCHAR                   NewExtChannelOffset = 0xff;
-#ifdef DOT11_N_SUPPORT
         UCHAR                   CentralChannel;
-#endif // DOT11_N_SUPPORT //
 
         // Init Variable IE structure
         pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE;
@@ -800,7 +792,7 @@ VOID PeerBeaconAtJoinAction(
                         RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen);
 
             NdisZeroMemory(pAd->StaActive.SupportedPhyInfo.MCSSet, 16);
-#ifdef DOT11_N_SUPPORT
+
                         pAd->MlmeAux.NewExtChannelOffset = NewExtChannelOffset;
                         pAd->MlmeAux.HtCapabilityLen = HtCapabilityLen;
 
@@ -845,7 +837,6 @@ VOID PeerBeaconAtJoinAction(
 
                         }
                         else
-#endif // DOT11_N_SUPPORT //
                         {
                                 // To prevent error, let legacy AP must have same CentralChannel and Channel.
                                 if ((HtCapabilityLen == 0) && (PreNHtCapabilityLen == 0))
@@ -860,9 +851,7 @@ VOID PeerBeaconAtJoinAction(
 
                         // copy QOS related information
                         if ((pAd->CommonCfg.bWmmCapable)
-#ifdef DOT11_N_SUPPORT
                                  || (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
-#endif // DOT11_N_SUPPORT //
                                 )
                         {
                                 NdisMoveMemory(&pAd->MlmeAux.APEdcaParm, &EdcaParm, sizeof(EDCA_PARM));
@@ -1003,14 +992,12 @@ VOID PeerBeacon(
                 if (pAd->Mlme.CntlMachine.CurrState == CNTL_WAIT_DISASSOC)
                         return;
 
-#ifdef DOT11_N_SUPPORT
                 // Copy Control channel for this BSSID.
                 if (AddHtInfoLen != 0)
                         Channel = AddHtInfo.ControlChan;
 
                 if ((HtCapabilityLen > 0) || (PreNHtCapabilityLen > 0))
                         HtCapabilityLen = SIZE_HT_CAP_IE;
-#endif // DOT11_N_SUPPORT //
 
                 //
                 // Housekeeping "SsidBssTab" table for later-on ROAMing usage.
@@ -1248,7 +1235,6 @@ VOID PeerBeacon(
                                         DBGPRINT(RT_DEBUG_WARN, ("SYNC - AP changed B/G protection to %d\n", bUseBGProtection));
                                 }
 
-#ifdef DOT11_N_SUPPORT
                                 // check Ht protection mode. and adhere to the Non-GF device indication by AP.
                                 if ((AddHtInfoLen != 0) &&
                                         ((AddHtInfo.AddHtInfo2.OperaionMode != pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode) ||
@@ -1265,7 +1251,6 @@ VOID PeerBeacon(
 
                                         DBGPRINT(RT_DEBUG_TRACE, ("SYNC - AP changed N OperaionMode to %d\n", pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode));
                                 }
-#endif // DOT11_N_SUPPORT //
 
                                 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_SHORT_PREAMBLE_INUSED) &&
                                         ERP_IS_USE_BARKER_PREAMBLE(Erp))
@@ -1360,9 +1345,7 @@ VOID PeerProbeReqAction(
         UCHAR         Addr2[MAC_ADDR_LEN];
         CHAR          Ssid[MAX_LEN_OF_SSID];
         UCHAR         SsidLen;
-#ifdef DOT11_N_SUPPORT
         UCHAR             HtLen, AddHtLen, NewExtLen;
-#endif // DOT11_N_SUPPORT //
         HEADER_802_11 ProbeRspHdr;
         NDIS_STATUS   NStatus;
         PUCHAR        pOutBuffer = NULL;
@@ -1435,7 +1418,7 @@ VOID PeerProbeReqAction(
                                                                         END_OF_ARGS);
                                 FrameLen += tmp;
                         }
-#ifdef DOT11_N_SUPPORT
+
                         if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
                         {
                                 ULONG TmpLen;
@@ -1468,7 +1451,7 @@ VOID PeerProbeReqAction(
                                 }
                                 FrameLen += TmpLen;
                         }
-#endif // DOT11_N_SUPPORT //
+
                         MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen);
                         MlmeFreeMemory(pAd, pOutBuffer);
                 }