aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-26 10:06:02 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:48 -0400
commitfa46aa71d7362798956d11f794971b50054d19b7 (patch)
treeed1110660a1f1155c3fc218f608d61b766a99400
parent1623267ab40fb52e33b889cdb5c8b796be454a20 (diff)
Staging: rt2870: remove DOT11_N_SUPPORT ifdefs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/rt2870/2870_main_dev.c2
-rw-r--r--drivers/staging/rt2870/Makefile1
-rw-r--r--drivers/staging/rt2870/ap.h2
-rw-r--r--drivers/staging/rt2870/chlist.h8
-rw-r--r--drivers/staging/rt2870/common/action.c8
-rw-r--r--drivers/staging/rt2870/common/ba_action.c5
-rw-r--r--drivers/staging/rt2870/common/cmm_data.c40
-rw-r--r--drivers/staging/rt2870/common/cmm_info.c32
-rw-r--r--drivers/staging/rt2870/common/cmm_sanity.c2
-rw-r--r--drivers/staging/rt2870/common/cmm_sync.c9
-rw-r--r--drivers/staging/rt2870/common/mlme.c92
-rw-r--r--drivers/staging/rt2870/common/rtmp_init.c15
-rw-r--r--drivers/staging/rt2870/common/spectrum.c4
-rw-r--r--drivers/staging/rt2870/oid.h2
-rw-r--r--drivers/staging/rt2870/rt_linux.c2
-rw-r--r--drivers/staging/rt2870/rt_main_dev.c15
-rw-r--r--drivers/staging/rt2870/rt_profile.c9
-rw-r--r--drivers/staging/rt2870/rtmp.h66
-rw-r--r--drivers/staging/rt2870/rtmp_def.h10
-rw-r--r--drivers/staging/rt2870/sta/assoc.c15
-rw-r--r--drivers/staging/rt2870/sta/connect.c41
-rw-r--r--drivers/staging/rt2870/sta/rtmp_data.c22
-rw-r--r--drivers/staging/rt2870/sta/sanity.c2
-rw-r--r--drivers/staging/rt2870/sta/sync.c29
-rw-r--r--drivers/staging/rt2870/sta_ioctl.c46
25 files changed, 34 insertions, 445 deletions
diff --git a/drivers/staging/rt2870/2870_main_dev.c b/drivers/staging/rt2870/2870_main_dev.c
index 683a5ed3618..85e75539879 100644
--- a/drivers/staging/rt2870/2870_main_dev.c
+++ b/drivers/staging/rt2870/2870_main_dev.c
@@ -709,7 +709,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd)
709 } 709 }
710 } 710 }
711 711
712#ifdef DOT11_N_SUPPORT
713 // For Sigma debug, dump the ba_reordering sequence. 712 // For Sigma debug, dump the ba_reordering sequence.
714 if((needDumpSeq == TRUE) && (pAd->CommonCfg.bDisableReordering == 0)) 713 if((needDumpSeq == TRUE) && (pAd->CommonCfg.bDisableReordering == 0))
715 { 714 {
@@ -737,7 +736,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd)
737 NdisReleaseSpinLock(&pBAEntry->RxReRingLock); 736 NdisReleaseSpinLock(&pBAEntry->RxReRingLock);
738 } 737 }
739 } 738 }
740#endif // DOT11_N_SUPPORT //
741} 739}
742 740
743/* 741/*
diff --git a/drivers/staging/rt2870/Makefile b/drivers/staging/rt2870/Makefile
index 31ed4802294..3c17921b74a 100644
--- a/drivers/staging/rt2870/Makefile
+++ b/drivers/staging/rt2870/Makefile
@@ -4,7 +4,6 @@ obj-$(CONFIG_RT2870) += rt2870sta.o
4EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT 4EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
5EXTRA_CFLAGS += -DRT2870 5EXTRA_CFLAGS += -DRT2870
6EXTRA_CFLAGS += -DDBG 6EXTRA_CFLAGS += -DDBG
7EXTRA_CFLAGS += -DDOT11_N_SUPPORT
8 7
9rt2870sta-objs := \ 8rt2870sta-objs := \
10 common/md5.o \ 9 common/md5.o \
diff --git a/drivers/staging/rt2870/ap.h b/drivers/staging/rt2870/ap.h
index 42f005d4fdd..217df0ee1b3 100644
--- a/drivers/staging/rt2870/ap.h
+++ b/drivers/staging/rt2870/ap.h
@@ -419,10 +419,8 @@ VOID ApLogEvent(
419 IN PUCHAR pAddr, 419 IN PUCHAR pAddr,
420 IN USHORT Event); 420 IN USHORT Event);
421 421
422#ifdef DOT11_N_SUPPORT
423VOID APUpdateOperationMode( 422VOID APUpdateOperationMode(
424 IN PRTMP_ADAPTER pAd); 423 IN PRTMP_ADAPTER pAd);
425#endif // DOT11_N_SUPPORT //
426 424
427VOID APUpdateCapabilityAndErpIe( 425VOID APUpdateCapabilityAndErpIe(
428 IN PRTMP_ADAPTER pAd); 426 IN PRTMP_ADAPTER pAd);
diff --git a/drivers/staging/rt2870/chlist.h b/drivers/staging/rt2870/chlist.h
index 9e15b9daeb8..60f8548a57e 100644
--- a/drivers/staging/rt2870/chlist.h
+++ b/drivers/staging/rt2870/chlist.h
@@ -957,16 +957,12 @@ static inline VOID ChBandCheck(
957 switch(PhyMode) 957 switch(PhyMode)
958 { 958 {
959 case PHY_11A: 959 case PHY_11A:
960#ifdef DOT11_N_SUPPORT
961 case PHY_11AN_MIXED: 960 case PHY_11AN_MIXED:
962#endif // DOT11_N_SUPPORT //
963 *pChType = BAND_5G; 961 *pChType = BAND_5G;
964 break; 962 break;
965 case PHY_11ABG_MIXED: 963 case PHY_11ABG_MIXED:
966#ifdef DOT11_N_SUPPORT
967 case PHY_11AGN_MIXED: 964 case PHY_11AGN_MIXED:
968 case PHY_11ABGN_MIXED: 965 case PHY_11ABGN_MIXED:
969#endif // DOT11_N_SUPPORT //
970 *pChType = BAND_BOTH; 966 *pChType = BAND_BOTH;
971 break; 967 break;
972 968
@@ -1114,8 +1110,6 @@ static inline VOID BuildBeaconChList(
1114 } 1110 }
1115} 1111}
1116 1112
1117
1118#ifdef DOT11_N_SUPPORT
1119static inline BOOLEAN IsValidChannel( 1113static inline BOOLEAN IsValidChannel(
1120 IN PRTMP_ADAPTER pAd, 1114 IN PRTMP_ADAPTER pAd,
1121 IN UCHAR channel) 1115 IN UCHAR channel)
@@ -1273,8 +1267,6 @@ static inline VOID N_SetCenCh(
1273 pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel; 1267 pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel;
1274 } 1268 }
1275} 1269}
1276#endif // DOT11_N_SUPPORT //
1277
1278 1270
1279static inline UINT8 GetCuntryMaxTxPwr( 1271static inline UINT8 GetCuntryMaxTxPwr(
1280 IN PRTMP_ADAPTER pAd, 1272 IN PRTMP_ADAPTER pAd,
diff --git a/drivers/staging/rt2870/common/action.c b/drivers/staging/rt2870/common/action.c
index 8fc4c830b77..932afb699c2 100644
--- a/drivers/staging/rt2870/common/action.c
+++ b/drivers/staging/rt2870/common/action.c
@@ -73,13 +73,11 @@ VOID ActionStateMachineInit(
73 73
74 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_DLS_CATE, (STATE_MACHINE_FUNC)ReservedAction); 74 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_DLS_CATE, (STATE_MACHINE_FUNC)ReservedAction);
75 75
76#ifdef DOT11_N_SUPPORT
77 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_BA_CATE, (STATE_MACHINE_FUNC)PeerBAAction); 76 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_BA_CATE, (STATE_MACHINE_FUNC)PeerBAAction);
78 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_HT_CATE, (STATE_MACHINE_FUNC)PeerHTAction); 77 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_HT_CATE, (STATE_MACHINE_FUNC)PeerHTAction);
79 StateMachineSetAction(S, ACT_IDLE, MT2_MLME_ADD_BA_CATE, (STATE_MACHINE_FUNC)MlmeADDBAAction); 78 StateMachineSetAction(S, ACT_IDLE, MT2_MLME_ADD_BA_CATE, (STATE_MACHINE_FUNC)MlmeADDBAAction);
80 StateMachineSetAction(S, ACT_IDLE, MT2_MLME_ORI_DELBA_CATE, (STATE_MACHINE_FUNC)MlmeDELBAAction); 79 StateMachineSetAction(S, ACT_IDLE, MT2_MLME_ORI_DELBA_CATE, (STATE_MACHINE_FUNC)MlmeDELBAAction);
81 StateMachineSetAction(S, ACT_IDLE, MT2_MLME_REC_DELBA_CATE, (STATE_MACHINE_FUNC)MlmeDELBAAction); 80 StateMachineSetAction(S, ACT_IDLE, MT2_MLME_REC_DELBA_CATE, (STATE_MACHINE_FUNC)MlmeDELBAAction);
82#endif // DOT11_N_SUPPORT //
83 81
84 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_PUBLIC_CATE, (STATE_MACHINE_FUNC)PeerPublicAction); 82 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_PUBLIC_CATE, (STATE_MACHINE_FUNC)PeerPublicAction);
85 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_RM_CATE, (STATE_MACHINE_FUNC)PeerRMAction); 83 StateMachineSetAction(S, ACT_IDLE, MT2_PEER_RM_CATE, (STATE_MACHINE_FUNC)PeerRMAction);
@@ -89,7 +87,6 @@ VOID ActionStateMachineInit(
89 StateMachineSetAction(S, ACT_IDLE, MT2_ACT_INVALID, (STATE_MACHINE_FUNC)MlmeInvalidAction); 87 StateMachineSetAction(S, ACT_IDLE, MT2_ACT_INVALID, (STATE_MACHINE_FUNC)MlmeInvalidAction);
90} 88}
91 89
92#ifdef DOT11_N_SUPPORT
93VOID MlmeADDBAAction( 90VOID MlmeADDBAAction(
94 IN PRTMP_ADAPTER pAd, 91 IN PRTMP_ADAPTER pAd,
95 IN MLME_QUEUE_ELEM *Elem) 92 IN MLME_QUEUE_ELEM *Elem)
@@ -254,7 +251,6 @@ VOID MlmeDELBAAction(
254 DBGPRINT(RT_DEBUG_TRACE, ("BA - MlmeDELBAAction() . 3 DELBA sent. Initiator(%d)\n", pInfo->Initiator)); 251 DBGPRINT(RT_DEBUG_TRACE, ("BA - MlmeDELBAAction() . 3 DELBA sent. Initiator(%d)\n", pInfo->Initiator));
255 } 252 }
256} 253}
257#endif // DOT11_N_SUPPORT //
258 254
259VOID MlmeQOSAction( 255VOID MlmeQOSAction(
260 IN PRTMP_ADAPTER pAd, 256 IN PRTMP_ADAPTER pAd,
@@ -282,7 +278,6 @@ VOID PeerQOSAction(
282{ 278{
283} 279}
284 280
285#ifdef DOT11_N_SUPPORT
286VOID PeerBAAction( 281VOID PeerBAAction(
287 IN PRTMP_ADAPTER pAd, 282 IN PRTMP_ADAPTER pAd,
288 IN MLME_QUEUE_ELEM *Elem) 283 IN MLME_QUEUE_ELEM *Elem)
@@ -302,7 +297,6 @@ VOID PeerBAAction(
302 break; 297 break;
303 } 298 }
304} 299}
305#endif // DOT11_N_SUPPORT //
306 300
307VOID PeerPublicAction( 301VOID PeerPublicAction(
308 IN PRTMP_ADAPTER pAd, 302 IN PRTMP_ADAPTER pAd,
@@ -337,7 +331,6 @@ VOID PeerRMAction(
337 return; 331 return;
338} 332}
339 333
340#ifdef DOT11_N_SUPPORT
341static VOID respond_ht_information_exchange_action( 334static VOID respond_ht_information_exchange_action(
342 IN PRTMP_ADAPTER pAd, 335 IN PRTMP_ADAPTER pAd,
343 IN MLME_QUEUE_ELEM *Elem) 336 IN MLME_QUEUE_ELEM *Elem)
@@ -557,7 +550,6 @@ VOID SendRefreshBAR(
557 } 550 }
558 } 551 }
559} 552}
560#endif // DOT11_N_SUPPORT //
561 553
562VOID ActHeaderInit( 554VOID ActHeaderInit(
563 IN PRTMP_ADAPTER pAd, 555 IN PRTMP_ADAPTER pAd,
diff --git a/drivers/staging/rt2870/common/ba_action.c b/drivers/staging/rt2870/common/ba_action.c
index bbd759faec1..f9d4572505d 100644
--- a/drivers/staging/rt2870/common/ba_action.c
+++ b/drivers/staging/rt2870/common/ba_action.c
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28 28
29#ifdef DOT11_N_SUPPORT
30
31#include "../rt_config.h" 29#include "../rt_config.h"
32 30
33 31
@@ -1764,6 +1762,3 @@ VOID Indicate_AMPDU_Packet(
1764#endif 1762#endif
1765 } 1763 }
1766} 1764}
1767
1768#endif // DOT11_N_SUPPORT //
1769
diff --git a/drivers/staging/rt2870/common/cmm_data.c b/drivers/staging/rt2870/common/cmm_data.c
index 3b1e10e420a..ee7480c1346 100644
--- a/drivers/staging/rt2870/common/cmm_data.c
+++ b/drivers/staging/rt2870/common/cmm_data.c
@@ -281,9 +281,7 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
281 { 281 {
282 // Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode. 282 // Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode.
283 if (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED 283 if (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED
284#ifdef DOT11_N_SUPPORT
285 || pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED 284 || pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED
286#endif // DOT11_N_SUPPORT //
287 ) 285 )
288 { 286 {
289 if (pAd->LatchRfRegs.Channel > 14) 287 if (pAd->LatchRfRegs.Channel > 14)
@@ -511,9 +509,7 @@ static UCHAR TxPktClassification(
511 UCHAR TxFrameType = TX_UNKOWN_FRAME; 509 UCHAR TxFrameType = TX_UNKOWN_FRAME;
512 UCHAR Wcid; 510 UCHAR Wcid;
513 MAC_TABLE_ENTRY *pMacEntry = NULL; 511 MAC_TABLE_ENTRY *pMacEntry = NULL;
514#ifdef DOT11_N_SUPPORT
515 BOOLEAN bHTRate = FALSE; 512 BOOLEAN bHTRate = FALSE;
516#endif // DOT11_N_SUPPORT //
517 513
518 Wcid = RTMP_GET_PACKET_WCID(pPacket); 514 Wcid = RTMP_GET_PACKET_WCID(pPacket);
519 if (Wcid == MCAST_WCID) 515 if (Wcid == MCAST_WCID)
@@ -527,7 +523,6 @@ static UCHAR TxPktClassification(
527 { // It's a specific packet need to force low rate, i.e., bDHCPFrame, bEAPOLFrame, bWAIFrame 523 { // It's a specific packet need to force low rate, i.e., bDHCPFrame, bEAPOLFrame, bWAIFrame
528 TxFrameType = TX_LEGACY_FRAME; 524 TxFrameType = TX_LEGACY_FRAME;
529 } 525 }
530#ifdef DOT11_N_SUPPORT
531 else if (IS_HT_RATE(pMacEntry)) 526 else if (IS_HT_RATE(pMacEntry))
532 { // it's a 11n capable packet 527 { // it's a 11n capable packet
533 528
@@ -547,7 +542,6 @@ static UCHAR TxPktClassification(
547 else 542 else
548 TxFrameType = TX_LEGACY_FRAME; 543 TxFrameType = TX_LEGACY_FRAME;
549 } 544 }
550#endif // DOT11_N_SUPPORT //
551 else 545 else
552 { // it's a legacy b/g packet. 546 { // it's a legacy b/g packet.
553 if ((CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_AGGREGATION_CAPABLE) && pAd->CommonCfg.bAggregationCapable) && 547 if ((CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_AGGREGATION_CAPABLE) && pAd->CommonCfg.bAggregationCapable) &&
@@ -649,7 +643,7 @@ BOOLEAN RTMP_FillTxBlkInfo(
649 ((pAd->OpMode == OPMODE_AP) && (pMacEntry->MaxHTPhyMode.field.MODE == MODE_CCK) && (pMacEntry->MaxHTPhyMode.field.MCS == RATE_1))) 643 ((pAd->OpMode == OPMODE_AP) && (pMacEntry->MaxHTPhyMode.field.MODE == MODE_CCK) && (pMacEntry->MaxHTPhyMode.field.MCS == RATE_1)))
650 { // Specific packet, i.e., bDHCPFrame, bEAPOLFrame, bWAIFrame, need force low rate. 644 { // Specific packet, i.e., bDHCPFrame, bEAPOLFrame, bWAIFrame, need force low rate.
651 pTxBlk->pTransmit = &pAd->MacTab.Content[MCAST_WCID].HTPhyMode; 645 pTxBlk->pTransmit = &pAd->MacTab.Content[MCAST_WCID].HTPhyMode;
652#ifdef DOT11_N_SUPPORT 646
653 // Modify the WMM bit for ICV issue. If we have a packet with EOSP field need to set as 1, how to handle it??? 647 // Modify the WMM bit for ICV issue. If we have a packet with EOSP field need to set as 1, how to handle it???
654 if (IS_HT_STA(pTxBlk->pMacEntry) && 648 if (IS_HT_STA(pTxBlk->pMacEntry) &&
655 (CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_RALINK_CHIPSET)) && 649 (CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_RALINK_CHIPSET)) &&
@@ -658,16 +652,13 @@ BOOLEAN RTMP_FillTxBlkInfo(
658 TX_BLK_CLEAR_FLAG(pTxBlk, fTX_bWMM); 652 TX_BLK_CLEAR_FLAG(pTxBlk, fTX_bWMM);
659 TX_BLK_SET_FLAG(pTxBlk, fTX_bForceNonQoS); 653 TX_BLK_SET_FLAG(pTxBlk, fTX_bForceNonQoS);
660 } 654 }
661#endif // DOT11_N_SUPPORT //
662 } 655 }
663 656
664#ifdef DOT11_N_SUPPORT
665 if ( (IS_HT_RATE(pMacEntry) == FALSE) && 657 if ( (IS_HT_RATE(pMacEntry) == FALSE) &&
666 (CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_PIGGYBACK_CAPABLE))) 658 (CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_PIGGYBACK_CAPABLE)))
667 { // Currently piggy-back only support when peer is operate in b/g mode. 659 { // Currently piggy-back only support when peer is operate in b/g mode.
668 TX_BLK_SET_FLAG(pTxBlk, fTX_bPiggyBack); 660 TX_BLK_SET_FLAG(pTxBlk, fTX_bPiggyBack);
669 } 661 }
670#endif // DOT11_N_SUPPORT //
671 662
672 if (RTMP_GET_PACKET_MOREDATA(pPacket)) 663 if (RTMP_GET_PACKET_MOREDATA(pPacket))
673 { 664 {
@@ -1048,7 +1039,6 @@ VOID RTMPWriteTxWI(
1048 1039
1049 pTxWI->NSEQ = NSeq; 1040 pTxWI->NSEQ = NSeq;
1050 // John tune the performace with Intel Client in 20 MHz performance 1041 // John tune the performace with Intel Client in 20 MHz performance
1051#ifdef DOT11_N_SUPPORT
1052 BASize = pAd->CommonCfg.TxBASize; 1042 BASize = pAd->CommonCfg.TxBASize;
1053 1043
1054 if( BASize >7 ) 1044 if( BASize >7 )
@@ -1056,7 +1046,6 @@ VOID RTMPWriteTxWI(
1056 pTxWI->BAWinSize = BASize; 1046 pTxWI->BAWinSize = BASize;
1057 pTxWI->ShortGI = pTransmit->field.ShortGI; 1047 pTxWI->ShortGI = pTransmit->field.ShortGI;
1058 pTxWI->STBC = pTransmit->field.STBC; 1048 pTxWI->STBC = pTransmit->field.STBC;
1059#endif // DOT11_N_SUPPORT //
1060 1049
1061 pTxWI->WirelessCliID = WCID; 1050 pTxWI->WirelessCliID = WCID;
1062 pTxWI->MPDUtotalByteCount = Length; 1051 pTxWI->MPDUtotalByteCount = Length;
@@ -1069,7 +1058,6 @@ VOID RTMPWriteTxWI(
1069 pTxWI->PHYMODE = pTransmit->field.MODE; 1058 pTxWI->PHYMODE = pTransmit->field.MODE;
1070 pTxWI->CFACK = CfAck; 1059 pTxWI->CFACK = CfAck;
1071 1060
1072#ifdef DOT11_N_SUPPORT
1073 if (pMac) 1061 if (pMac)
1074 { 1062 {
1075 if (pAd->CommonCfg.bMIMOPSEnable) 1063 if (pAd->CommonCfg.bMIMOPSEnable)
@@ -1099,7 +1087,6 @@ VOID RTMPWriteTxWI(
1099 pTxWI->MpduDensity = pMac->MpduDensity; 1087 pTxWI->MpduDensity = pMac->MpduDensity;
1100 } 1088 }
1101 } 1089 }
1102#endif // DOT11_N_SUPPORT //
1103 1090
1104 pTxWI->PacketId = pTxWI->MCS; 1091 pTxWI->PacketId = pTxWI->MCS;
1105 NdisMoveMemory(pOutTxWI, &TxWI, sizeof(TXWI_STRUC)); 1092 NdisMoveMemory(pOutTxWI, &TxWI, sizeof(TXWI_STRUC));
@@ -1113,10 +1100,7 @@ VOID RTMPWriteTxWI_Data(
1113{ 1100{
1114 HTTRANSMIT_SETTING *pTransmit; 1101 HTTRANSMIT_SETTING *pTransmit;
1115 PMAC_TABLE_ENTRY pMacEntry; 1102 PMAC_TABLE_ENTRY pMacEntry;
1116#ifdef DOT11_N_SUPPORT
1117 UCHAR BASize; 1103 UCHAR BASize;
1118#endif // DOT11_N_SUPPORT //
1119
1120 1104
1121 ASSERT(pTxWI); 1105 ASSERT(pTxWI);
1122 1106
@@ -1142,7 +1126,6 @@ VOID RTMPWriteTxWI_Data(
1142 1126
1143 // If CCK or OFDM, BW must be 20 1127 // If CCK or OFDM, BW must be 20
1144 pTxWI->BW = (pTransmit->field.MODE <= MODE_OFDM) ? (BW_20) : (pTransmit->field.BW); 1128 pTxWI->BW = (pTransmit->field.MODE <= MODE_OFDM) ? (BW_20) : (pTransmit->field.BW);
1145#ifdef DOT11_N_SUPPORT
1146 pTxWI->AMPDU = ((pTxBlk->TxFrameType == TX_AMPDU_FRAME) ? TRUE : FALSE); 1129 pTxWI->AMPDU = ((pTxBlk->TxFrameType == TX_AMPDU_FRAME) ? TRUE : FALSE);
1147 1130
1148 // John tune the performace with Intel Client in 20 MHz performance 1131 // John tune the performace with Intel Client in 20 MHz performance
@@ -1164,12 +1147,10 @@ VOID RTMPWriteTxWI_Data(
1164 pTxWI->BAWinSize = BASize; 1147 pTxWI->BAWinSize = BASize;
1165 pTxWI->ShortGI = pTransmit->field.ShortGI; 1148 pTxWI->ShortGI = pTransmit->field.ShortGI;
1166 pTxWI->STBC = pTransmit->field.STBC; 1149 pTxWI->STBC = pTransmit->field.STBC;
1167#endif // DOT11_N_SUPPORT //
1168 1150
1169 pTxWI->MCS = pTransmit->field.MCS; 1151 pTxWI->MCS = pTransmit->field.MCS;
1170 pTxWI->PHYMODE = pTransmit->field.MODE; 1152 pTxWI->PHYMODE = pTransmit->field.MODE;
1171 1153
1172#ifdef DOT11_N_SUPPORT
1173 if (pMacEntry) 1154 if (pMacEntry)
1174 { 1155 {
1175 if ((pMacEntry->MmpsMode == MMPS_DYNAMIC) && (pTransmit->field.MCS > 7)) 1156 if ((pMacEntry->MmpsMode == MMPS_DYNAMIC) && (pTransmit->field.MCS > 7))
@@ -1196,7 +1177,6 @@ VOID RTMPWriteTxWI_Data(
1196 pTxWI->MpduDensity = pMacEntry->MpduDensity; 1177 pTxWI->MpduDensity = pMacEntry->MpduDensity;
1197 } 1178 }
1198 } 1179 }
1199#endif // DOT11_N_SUPPORT //
1200 1180
1201#ifdef DBG_DIAGNOSE 1181#ifdef DBG_DIAGNOSE
1202 if (pTxBlk->QueIdx== 0) 1182 if (pTxBlk->QueIdx== 0)
@@ -1241,7 +1221,6 @@ VOID RTMPWriteTxWI_Cache(
1241 pTxWI->PacketId = pTransmit->field.MCS; 1221 pTxWI->PacketId = pTransmit->field.MCS;
1242 } 1222 }
1243 1223
1244#ifdef DOT11_N_SUPPORT
1245 pTxWI->AMPDU = ((pMacEntry->NoBADataCountDown == 0) ? TRUE: FALSE); 1224 pTxWI->AMPDU = ((pMacEntry->NoBADataCountDown == 0) ? TRUE: FALSE);
1246 pTxWI->MIMOps = 0; 1225 pTxWI->MIMOps = 0;
1247 1226
@@ -1263,7 +1242,6 @@ VOID RTMPWriteTxWI_Cache(
1263 } 1242 }
1264 } 1243 }
1265 } 1244 }
1266#endif // DOT11_N_SUPPORT //
1267 1245
1268#ifdef DBG_DIAGNOSE 1246#ifdef DBG_DIAGNOSE
1269 if (pTxBlk->QueIdx== 0) 1247 if (pTxBlk->QueIdx== 0)
@@ -1380,12 +1358,10 @@ BOOLEAN PeerIsAggreOn(
1380 1358
1381 if (pMacEntry != NULL && CLIENT_STATUS_TEST_FLAG(pMacEntry, AFlags)) 1359 if (pMacEntry != NULL && CLIENT_STATUS_TEST_FLAG(pMacEntry, AFlags))
1382 { 1360 {
1383#ifdef DOT11_N_SUPPORT
1384 if (pMacEntry->HTPhyMode.field.MODE >= MODE_HTMIX) 1361 if (pMacEntry->HTPhyMode.field.MODE >= MODE_HTMIX)
1385 { 1362 {
1386 return TRUE; 1363 return TRUE;
1387 } 1364 }
1388#endif // DOT11_N_SUPPORT //
1389 1365
1390#ifdef AGGREGATION_SUPPORT 1366#ifdef AGGREGATION_SUPPORT
1391 if (TxRate >= RATE_6 && pAd->CommonCfg.bAggregationCapable && (!(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED) && CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_WMM_CAPABLE)))) 1367 if (TxRate >= RATE_6 && pAd->CommonCfg.bAggregationCapable && (!(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED) && CLIENT_STATUS_TEST_FLAG(pMacEntry, fCLIENT_STATUS_WMM_CAPABLE))))
@@ -1852,11 +1828,8 @@ BOOLEAN MacTableDeleteEntry(
1852 // Delete this entry from ASIC on-chip WCID Table 1828 // Delete this entry from ASIC on-chip WCID Table
1853 RT28XX_STA_ENTRY_MAC_RESET(pAd, wcid); 1829 RT28XX_STA_ENTRY_MAC_RESET(pAd, wcid);
1854 1830
1855#ifdef DOT11_N_SUPPORT
1856 // free resources of BA 1831 // free resources of BA
1857 BASessionTearDownALL(pAd, pEntry->Aid); 1832 BASessionTearDownALL(pAd, pEntry->Aid);
1858#endif // DOT11_N_SUPPORT //
1859
1860 1833
1861 pPrevEntry = NULL; 1834 pPrevEntry = NULL;
1862 pProbeEntry = pAd->MacTab.Hash[HashIdx]; 1835 pProbeEntry = pAd->MacTab.Hash[HashIdx];
@@ -1910,9 +1883,7 @@ BOOLEAN MacTableDeleteEntry(
1910 //Reset operating mode when no Sta. 1883 //Reset operating mode when no Sta.
1911 if (pAd->MacTab.Size == 0) 1884 if (pAd->MacTab.Size == 0)
1912 { 1885 {
1913#ifdef DOT11_N_SUPPORT
1914 pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode = 0; 1886 pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode = 0;
1915#endif // DOT11_N_SUPPORT //
1916 AsicUpdateProtect(pAd, 0 /*pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode*/, (ALLN_SETPROTECT), TRUE, 0 /*pAd->MacTab.fAnyStationNonGF*/); 1887 AsicUpdateProtect(pAd, 0 /*pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode*/, (ALLN_SETPROTECT), TRUE, 0 /*pAd->MacTab.fAnyStationNonGF*/);
1917 } 1888 }
1918 1889
@@ -1939,11 +1910,8 @@ VOID MacTableReset(
1939 { 1910 {
1940 if (pAd->MacTab.Content[i].ValidAsCLI == TRUE) 1911 if (pAd->MacTab.Content[i].ValidAsCLI == TRUE)
1941 { 1912 {
1942
1943#ifdef DOT11_N_SUPPORT
1944 // free resources of BA 1913 // free resources of BA
1945 BASessionTearDownALL(pAd, i); 1914 BASessionTearDownALL(pAd, i);
1946#endif // DOT11_N_SUPPORT //
1947 1915
1948 pAd->MacTab.Content[i].ValidAsCLI = FALSE; 1916 pAd->MacTab.Content[i].ValidAsCLI = FALSE;
1949 1917
@@ -2279,7 +2247,6 @@ VOID Indicate_Legacy_Packet(
2279 STATS_INC_RX_PACKETS(pAd, FromWhichBSSID); 2247 STATS_INC_RX_PACKETS(pAd, FromWhichBSSID);
2280 2248
2281#ifdef RT2870 2249#ifdef RT2870
2282#ifdef DOT11_N_SUPPORT
2283 if (pAd->CommonCfg.bDisableReordering == 0) 2250 if (pAd->CommonCfg.bDisableReordering == 0)
2284 { 2251 {
2285 PBA_REC_ENTRY pBAEntry; 2252 PBA_REC_ENTRY pBAEntry;
@@ -2309,7 +2276,6 @@ VOID Indicate_Legacy_Packet(
2309 } 2276 }
2310 } 2277 }
2311 } 2278 }
2312#endif // DOT11_N_SUPPORT //
2313#endif // RT2870 // 2279#endif // RT2870 //
2314 2280
2315 wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID); 2281 wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID);
@@ -2328,22 +2294,18 @@ VOID CmmRxnonRalinkFrameIndicate(
2328 IN RX_BLK *pRxBlk, 2294 IN RX_BLK *pRxBlk,
2329 IN UCHAR FromWhichBSSID) 2295 IN UCHAR FromWhichBSSID)
2330{ 2296{
2331#ifdef DOT11_N_SUPPORT
2332 if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMPDU) && (pAd->CommonCfg.bDisableReordering == 0)) 2297 if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMPDU) && (pAd->CommonCfg.bDisableReordering == 0))
2333 { 2298 {
2334 Indicate_AMPDU_Packet(pAd, pRxBlk, FromWhichBSSID); 2299 Indicate_AMPDU_Packet(pAd, pRxBlk, FromWhichBSSID);
2335 } 2300 }
2336 else 2301 else
2337#endif // DOT11_N_SUPPORT //
2338 { 2302 {
2339#ifdef DOT11_N_SUPPORT
2340 if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU)) 2303 if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU))
2341 { 2304 {
2342 // handle A-MSDU 2305 // handle A-MSDU
2343 Indicate_AMSDU_Packet(pAd, pRxBlk, FromWhichBSSID); 2306 Indicate_AMSDU_Packet(pAd, pRxBlk, FromWhichBSSID);
2344 } 2307 }
2345 else 2308 else
2346#endif // DOT11_N_SUPPORT //
2347 { 2309 {
2348 Indicate_Legacy_Packet(pAd, pRxBlk, FromWhichBSSID); 2310 Indicate_Legacy_Packet(pAd, pRxBlk, FromWhichBSSID);
2349 } 2311 }
diff --git a/drivers/staging/rt2870/common/cmm_info.c b/drivers/staging/rt2870/common/cmm_info.c
index 99a5ca62f25..0b543514442 100644
--- a/drivers/staging/rt2870/common/cmm_info.c
+++ b/drivers/staging/rt2870/common/cmm_info.c
@@ -63,7 +63,6 @@ INT Show_FragThreshold_Proc(
63 IN PRTMP_ADAPTER pAd, 63 IN PRTMP_ADAPTER pAd,
64 OUT PUCHAR pBuf); 64 OUT PUCHAR pBuf);
65 65
66#ifdef DOT11_N_SUPPORT
67INT Show_HtBw_Proc( 66INT Show_HtBw_Proc(
68 IN PRTMP_ADAPTER pAd, 67 IN PRTMP_ADAPTER pAd,
69 OUT PUCHAR pBuf); 68 OUT PUCHAR pBuf);
@@ -103,7 +102,6 @@ INT Show_HtAmsdu_Proc(
103INT Show_HtAutoBa_Proc( 102INT Show_HtAutoBa_Proc(
104 IN PRTMP_ADAPTER pAd, 103 IN PRTMP_ADAPTER pAd,
105 OUT PUCHAR pBuf); 104 OUT PUCHAR pBuf);
106#endif // DOT11_N_SUPPORT //
107 105
108INT Show_CountryRegion_Proc( 106INT Show_CountryRegion_Proc(
109 IN PRTMP_ADAPTER pAd, 107 IN PRTMP_ADAPTER pAd,
@@ -182,7 +180,6 @@ static struct {
182 {"BGProtection", Show_BGProtection_Proc}, 180 {"BGProtection", Show_BGProtection_Proc},
183 {"RTSThreshold", Show_RTSThreshold_Proc}, 181 {"RTSThreshold", Show_RTSThreshold_Proc},
184 {"FragThreshold", Show_FragThreshold_Proc}, 182 {"FragThreshold", Show_FragThreshold_Proc},
185#ifdef DOT11_N_SUPPORT
186 {"HtBw", Show_HtBw_Proc}, 183 {"HtBw", Show_HtBw_Proc},
187 {"HtMcs", Show_HtMcs_Proc}, 184 {"HtMcs", Show_HtMcs_Proc},
188 {"HtGi", Show_HtGi_Proc}, 185 {"HtGi", Show_HtGi_Proc},
@@ -193,7 +190,6 @@ static struct {
193 {"HtRdg", Show_HtRdg_Proc}, 190 {"HtRdg", Show_HtRdg_Proc},
194 {"HtAmsdu", Show_HtAmsdu_Proc}, 191 {"HtAmsdu", Show_HtAmsdu_Proc},
195 {"HtAutoBa", Show_HtAutoBa_Proc}, 192 {"HtAutoBa", Show_HtAutoBa_Proc},
196#endif // DOT11_N_SUPPORT //
197 {"CountryRegion", Show_CountryRegion_Proc}, 193 {"CountryRegion", Show_CountryRegion_Proc},
198 {"CountryRegionABand", Show_CountryRegionABand_Proc}, 194 {"CountryRegionABand", Show_CountryRegionABand_Proc},
199 {"CountryCode", Show_CountryCode_Proc}, 195 {"CountryCode", Show_CountryCode_Proc},
@@ -344,14 +340,12 @@ INT Set_WirelessMode_Proc(
344 { 340 {
345 INT MaxPhyMode = PHY_11G; 341 INT MaxPhyMode = PHY_11G;
346 342
347#ifdef DOT11_N_SUPPORT
348 MaxPhyMode = PHY_11N_5G; 343 MaxPhyMode = PHY_11N_5G;
349#endif // DOT11_N_SUPPORT //
350 344
351 if (WirelessMode <= MaxPhyMode) 345 if (WirelessMode <= MaxPhyMode)
352 { 346 {
353 RTMPSetPhyMode(pAd, WirelessMode); 347 RTMPSetPhyMode(pAd, WirelessMode);
354#ifdef DOT11_N_SUPPORT 348
355 if (WirelessMode >= PHY_11ABGN_MIXED) 349 if (WirelessMode >= PHY_11ABGN_MIXED)
356 { 350 {
357 pAd->CommonCfg.BACapability.field.AutoBA = TRUE; 351 pAd->CommonCfg.BACapability.field.AutoBA = TRUE;
@@ -362,7 +356,7 @@ INT Set_WirelessMode_Proc(
362 pAd->CommonCfg.BACapability.field.AutoBA = FALSE; 356 pAd->CommonCfg.BACapability.field.AutoBA = FALSE;
363 pAd->CommonCfg.REGBACapability.field.AutoBA = FALSE; 357 pAd->CommonCfg.REGBACapability.field.AutoBA = FALSE;
364 } 358 }
365#endif // DOT11_N_SUPPORT // 359
366 // Set AdhocMode rates 360 // Set AdhocMode rates
367 if (pAd->StaCfg.BssType == BSS_ADHOC) 361 if (pAd->StaCfg.BssType == BSS_ADHOC)
368 { 362 {
@@ -380,9 +374,7 @@ INT Set_WirelessMode_Proc(
380 // it is needed to set SSID to take effect 374 // it is needed to set SSID to take effect
381 if (success == TRUE) 375 if (success == TRUE)
382 { 376 {
383#ifdef DOT11_N_SUPPORT
384 SetCommonHT(pAd); 377 SetCommonHT(pAd);
385#endif // DOT11_N_SUPPORT //
386 DBGPRINT(RT_DEBUG_TRACE, ("Set_WirelessMode_Proc::(=%ld)\n", WirelessMode)); 378 DBGPRINT(RT_DEBUG_TRACE, ("Set_WirelessMode_Proc::(=%ld)\n", WirelessMode));
387 } 379 }
388 else 380 else
@@ -419,7 +411,6 @@ INT Set_Channel_Proc(
419 411
420 if (MONITOR_ON(pAd)) 412 if (MONITOR_ON(pAd))
421 { 413 {
422#ifdef DOT11_N_SUPPORT
423 N_ChannelCheck(pAd); 414 N_ChannelCheck(pAd);
424 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED && 415 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED &&
425 pAd->CommonCfg.RegTransmitSetting.field.BW == BW_40) 416 pAd->CommonCfg.RegTransmitSetting.field.BW == BW_40)
@@ -431,7 +422,6 @@ INT Set_Channel_Proc(
431 pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel)); 422 pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel));
432 } 423 }
433 else 424 else
434#endif // DOT11_N_SUPPORT //
435 { 425 {
436 AsicSwitchChannel(pAd, pAd->CommonCfg.Channel, FALSE); 426 AsicSwitchChannel(pAd, pAd->CommonCfg.Channel, FALSE);
437 AsicLockChannel(pAd, pAd->CommonCfg.Channel); 427 AsicLockChannel(pAd, pAd->CommonCfg.Channel);
@@ -1489,12 +1479,10 @@ VOID RTMPSetPhyMode(
1489 case PHY_11G: 1479 case PHY_11G:
1490 case PHY_11BG_MIXED: 1480 case PHY_11BG_MIXED:
1491 case PHY_11ABG_MIXED: 1481 case PHY_11ABG_MIXED:
1492#ifdef DOT11_N_SUPPORT
1493 case PHY_11N_2_4G: 1482 case PHY_11N_2_4G:
1494 case PHY_11ABGN_MIXED: 1483 case PHY_11ABGN_MIXED:
1495 case PHY_11BGN_MIXED: 1484 case PHY_11BGN_MIXED:
1496 case PHY_11GN_MIXED: 1485 case PHY_11GN_MIXED:
1497#endif // DOT11_N_SUPPORT //
1498 pAd->CommonCfg.SupRate[0] = 0x82; // 1 mbps, in units of 0.5 Mbps, basic rate 1486 pAd->CommonCfg.SupRate[0] = 0x82; // 1 mbps, in units of 0.5 Mbps, basic rate
1499 pAd->CommonCfg.SupRate[1] = 0x84; // 2 mbps, in units of 0.5 Mbps, basic rate 1487 pAd->CommonCfg.SupRate[1] = 0x84; // 2 mbps, in units of 0.5 Mbps, basic rate
1500 pAd->CommonCfg.SupRate[2] = 0x8B; // 5.5 mbps, in units of 0.5 Mbps, basic rate 1488 pAd->CommonCfg.SupRate[2] = 0x8B; // 5.5 mbps, in units of 0.5 Mbps, basic rate
@@ -1524,11 +1512,9 @@ VOID RTMPSetPhyMode(
1524 break; 1512 break;
1525 1513
1526 case PHY_11A: 1514 case PHY_11A:
1527#ifdef DOT11_N_SUPPORT
1528 case PHY_11AN_MIXED: 1515 case PHY_11AN_MIXED:
1529 case PHY_11AGN_MIXED: 1516 case PHY_11AGN_MIXED:
1530 case PHY_11N_5G: 1517 case PHY_11N_5G:
1531#endif // DOT11_N_SUPPORT //
1532 pAd->CommonCfg.SupRate[0] = 0x8C; // 6 mbps, in units of 0.5 Mbps, basic rate 1518 pAd->CommonCfg.SupRate[0] = 0x8C; // 6 mbps, in units of 0.5 Mbps, basic rate
1533 pAd->CommonCfg.SupRate[1] = 0x12; // 9 mbps, in units of 0.5 Mbps 1519 pAd->CommonCfg.SupRate[1] = 0x12; // 9 mbps, in units of 0.5 Mbps
1534 pAd->CommonCfg.SupRate[2] = 0x98; // 12 mbps, in units of 0.5 Mbps, basic rate 1520 pAd->CommonCfg.SupRate[2] = 0x98; // 12 mbps, in units of 0.5 Mbps, basic rate
@@ -1558,8 +1544,6 @@ VOID RTMPSetPhyMode(
1558 pAd->CommonCfg.BandState = UNKNOWN_BAND; 1544 pAd->CommonCfg.BandState = UNKNOWN_BAND;
1559} 1545}
1560 1546
1561
1562#ifdef DOT11_N_SUPPORT
1563/* 1547/*
1564 ======================================================================== 1548 ========================================================================
1565 Routine Description: 1549 Routine Description:
@@ -1947,7 +1931,6 @@ VOID RTMPUpdateHTIE(
1947 1931
1948 DBGPRINT(RT_DEBUG_TRACE,("RTMPUpdateHTIE <== \n")); 1932 DBGPRINT(RT_DEBUG_TRACE,("RTMPUpdateHTIE <== \n"));
1949} 1933}
1950#endif // DOT11_N_SUPPORT //
1951 1934
1952/* 1935/*
1953 ======================================================================== 1936 ========================================================================
@@ -2229,9 +2212,7 @@ VOID RTMPIoctlGetMacTable(
2229 COPY_MAC_ADDR(MacTab.Entry[MacTab.Num].Addr, &pAd->MacTab.Content[i].Addr); 2212 COPY_MAC_ADDR(MacTab.Entry[MacTab.Num].Addr, &pAd->MacTab.Content[i].Addr);
2230 MacTab.Entry[MacTab.Num].Aid = (UCHAR)pAd->MacTab.Content[i].Aid; 2213 MacTab.Entry[MacTab.Num].Aid = (UCHAR)pAd->MacTab.Content[i].Aid;
2231 MacTab.Entry[MacTab.Num].Psm = pAd->MacTab.Content[i].PsMode; 2214 MacTab.Entry[MacTab.Num].Psm = pAd->MacTab.Content[i].PsMode;
2232#ifdef DOT11_N_SUPPORT
2233 MacTab.Entry[MacTab.Num].MimoPs = pAd->MacTab.Content[i].MmpsMode; 2215 MacTab.Entry[MacTab.Num].MimoPs = pAd->MacTab.Content[i].MmpsMode;
2234#endif // DOT11_N_SUPPORT //
2235 2216
2236 // Fill in RSSI per entry 2217 // Fill in RSSI per entry
2237 MacTab.Entry[MacTab.Num].AvgRssi0 = pAd->MacTab.Content[i].RssiSample.AvgRssi0; 2218 MacTab.Entry[MacTab.Num].AvgRssi0 = pAd->MacTab.Content[i].RssiSample.AvgRssi0;
@@ -2297,7 +2278,6 @@ VOID RTMPIoctlGetMacTable(
2297 kfree(msg); 2278 kfree(msg);
2298} 2279}
2299 2280
2300#ifdef DOT11_N_SUPPORT
2301INT Set_BASetup_Proc( 2281INT Set_BASetup_Proc(
2302 IN PRTMP_ADAPTER pAd, 2282 IN PRTMP_ADAPTER pAd,
2303 IN PUCHAR arg) 2283 IN PUCHAR arg)
@@ -2982,10 +2962,7 @@ INT Set_HtMimoPs_Proc(
2982 2962
2983 return TRUE; 2963 return TRUE;
2984} 2964}
2985#endif // DOT11_N_SUPPORT //
2986
2987 2965
2988#ifdef DOT11_N_SUPPORT
2989INT SetCommonHT( 2966INT SetCommonHT(
2990 IN PRTMP_ADAPTER pAd) 2967 IN PRTMP_ADAPTER pAd)
2991{ 2968{
@@ -3007,7 +2984,6 @@ INT SetCommonHT(
3007 2984
3008 return TRUE; 2985 return TRUE;
3009} 2986}
3010#endif // DOT11_N_SUPPORT //
3011 2987
3012INT Set_FixedTxMode_Proc( 2988INT Set_FixedTxMode_Proc(
3013 IN PRTMP_ADAPTER pAd, 2989 IN PRTMP_ADAPTER pAd,
@@ -3138,7 +3114,6 @@ INT Show_WirelessMode_Proc(
3138 case PHY_11G: 3114 case PHY_11G:
3139 sprintf(pBuf, "\t11G"); 3115 sprintf(pBuf, "\t11G");
3140 break; 3116 break;
3141#ifdef DOT11_N_SUPPORT
3142 case PHY_11ABGN_MIXED: 3117 case PHY_11ABGN_MIXED:
3143 sprintf(pBuf, "\t11A/B/G/N"); 3118 sprintf(pBuf, "\t11A/B/G/N");
3144 break; 3119 break;
@@ -3160,7 +3135,6 @@ INT Show_WirelessMode_Proc(
3160 case PHY_11N_5G: 3135 case PHY_11N_5G:
3161 sprintf(pBuf, "\t11N only with 5G"); 3136 sprintf(pBuf, "\t11N only with 5G");
3162 break; 3137 break;
3163#endif // DOT11_N_SUPPORT //
3164 default: 3138 default:
3165 sprintf(pBuf, "\tUnknow Value(%d)", pAd->CommonCfg.PhyMode); 3139 sprintf(pBuf, "\tUnknow Value(%d)", pAd->CommonCfg.PhyMode);
3166 break; 3140 break;
@@ -3254,7 +3228,6 @@ INT Show_FragThreshold_Proc(
3254 return 0; 3228 return 0;
3255} 3229}
3256 3230
3257#ifdef DOT11_N_SUPPORT
3258INT Show_HtBw_Proc( 3231INT Show_HtBw_Proc(
3259 IN PRTMP_ADAPTER pAd, 3232 IN PRTMP_ADAPTER pAd,
3260 OUT PUCHAR pBuf) 3233 OUT PUCHAR pBuf)
@@ -3376,7 +3349,6 @@ INT Show_HtAutoBa_Proc(
3376 sprintf(pBuf, "\t%s", pAd->CommonCfg.BACapability.field.AutoBA ? "TRUE":"FALSE"); 3349 sprintf(pBuf, "\t%s", pAd->CommonCfg.BACapability.field.AutoBA ? "TRUE":"FALSE");
3377 return 0; 3350 return 0;
3378} 3351}
3379#endif // DOT11_N_SUPPORT //
3380 3352
3381INT Show_CountryRegion_Proc( 3353INT Show_CountryRegion_Proc(
3382 IN PRTMP_ADAPTER pAd, 3354 IN PRTMP_ADAPTER pAd,
diff --git a/drivers/staging/rt2870/common/cmm_sanity.c b/drivers/staging/rt2870/common/cmm_sanity.c
index 16507797b3d..1376787853a 100644
--- a/drivers/staging/rt2870/common/cmm_sanity.c
+++ b/drivers/staging/rt2870/common/cmm_sanity.c
@@ -588,7 +588,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
588 else 588 else
589 *pRalinkIe = 0xf0000000; // Set to non-zero value (can't set bit0-2) to represent this is Ralink Chip. So at linkup, we will set ralinkchip flag. 589 *pRalinkIe = 0xf0000000; // Set to non-zero value (can't set bit0-2) to represent this is Ralink Chip. So at linkup, we will set ralinkchip flag.
590 } 590 }
591#ifdef DOT11_N_SUPPORT
592 // This HT IE is before IEEE draft set HT IE value.2006-09-28 by Jan. 591 // This HT IE is before IEEE draft set HT IE value.2006-09-28 by Jan.
593 592
594 // Other vendors had production before IE_HT_CAP value is assigned. To backward support those old-firmware AP, 593 // Other vendors had production before IE_HT_CAP value is assigned. To backward support those old-firmware AP,
@@ -607,7 +606,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
607 *AddHtInfoLen = SIZE_ADD_HT_INFO_IE; 606 *AddHtInfoLen = SIZE_ADD_HT_INFO_IE;
608 } 607 }
609 } 608 }
610#endif // DOT11_N_SUPPORT //
611 else if (NdisEqualMemory(pEid->Octet, WPA_OUI, 4)) 609 else if (NdisEqualMemory(pEid->Octet, WPA_OUI, 4))
612 { 610 {
613 // Copy to pVIE which will report to microsoft bssid list. 611 // Copy to pVIE which will report to microsoft bssid list.
diff --git a/drivers/staging/rt2870/common/cmm_sync.c b/drivers/staging/rt2870/common/cmm_sync.c
index ea843e22439..aac30cffa61 100644
--- a/drivers/staging/rt2870/common/cmm_sync.c
+++ b/drivers/staging/rt2870/common/cmm_sync.c
@@ -95,9 +95,7 @@ VOID BuildChannelList(
95 95
96 // if not 11a-only mode, channel list starts from 2.4Ghz band 96 // if not 11a-only mode, channel list starts from 2.4Ghz band
97 if ((pAd->CommonCfg.PhyMode != PHY_11A) 97 if ((pAd->CommonCfg.PhyMode != PHY_11A)
98#ifdef DOT11_N_SUPPORT
99 && (pAd->CommonCfg.PhyMode != PHY_11AN_MIXED) && (pAd->CommonCfg.PhyMode != PHY_11N_5G) 98 && (pAd->CommonCfg.PhyMode != PHY_11AN_MIXED) && (pAd->CommonCfg.PhyMode != PHY_11N_5G)
100#endif // DOT11_N_SUPPORT //
101 ) 99 )
102 { 100 {
103 switch (pAd->CommonCfg.CountryRegion & 0x7f) 101 switch (pAd->CommonCfg.CountryRegion & 0x7f)
@@ -146,10 +144,8 @@ VOID BuildChannelList(
146 } 144 }
147 145
148 if ((pAd->CommonCfg.PhyMode == PHY_11A) || (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED) 146 if ((pAd->CommonCfg.PhyMode == PHY_11A) || (pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED)
149#ifdef DOT11_N_SUPPORT
150 || (pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED) || (pAd->CommonCfg.PhyMode == PHY_11AN_MIXED) 147 || (pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED) || (pAd->CommonCfg.PhyMode == PHY_11AN_MIXED)
151 || (pAd->CommonCfg.PhyMode == PHY_11AGN_MIXED) || (pAd->CommonCfg.PhyMode == PHY_11N_5G) 148 || (pAd->CommonCfg.PhyMode == PHY_11AGN_MIXED) || (pAd->CommonCfg.PhyMode == PHY_11N_5G)
152#endif // DOT11_N_SUPPORT //
153 ) 149 )
154 { 150 {
155 switch (pAd->CommonCfg.CountryRegionForABand & 0x7f) 151 switch (pAd->CommonCfg.CountryRegionForABand & 0x7f)
@@ -506,9 +502,7 @@ VOID ScanNextChannel(
506 else // must be SCAN_PASSIVE or SCAN_ACTIVE 502 else // must be SCAN_PASSIVE or SCAN_ACTIVE
507 { 503 {
508 if ((pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED) 504 if ((pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED)
509#ifdef DOT11_N_SUPPORT
510 || (pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED) || (pAd->CommonCfg.PhyMode == PHY_11AGN_MIXED) 505 || (pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED) || (pAd->CommonCfg.PhyMode == PHY_11AGN_MIXED)
511#endif // DOT11_N_SUPPORT //
512 ) 506 )
513 { 507 {
514 if (pAd->MlmeAux.Channel > 14) 508 if (pAd->MlmeAux.Channel > 14)
@@ -567,7 +561,6 @@ VOID ScanNextChannel(
567 FrameLen += Tmp; 561 FrameLen += Tmp;
568 } 562 }
569 563
570#ifdef DOT11_N_SUPPORT
571 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) 564 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
572 { 565 {
573 ULONG Tmp; 566 ULONG Tmp;
@@ -597,8 +590,6 @@ VOID ScanNextChannel(
597 } 590 }
598 FrameLen += Tmp; 591 FrameLen += Tmp;
599 } 592 }
600#endif // DOT11_N_SUPPORT //
601
602 593
603 MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); 594 MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen);
604 MlmeFreeMemory(pAd, pOutBuffer); 595 MlmeFreeMemory(pAd, pOutBuffer);
diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c
index b8e9db559b7..a3d5924eabe 100644
--- a/drivers/staging/rt2870/common/mlme.c
+++ b/drivers/staging/rt2870/common/mlme.c
@@ -50,9 +50,7 @@ UCHAR Ccx2QosInfo[] = {0x00, 0x40, 0x96, 0x04};
50UCHAR RALINK_OUI[] = {0x00, 0x0c, 0x43}; 50UCHAR RALINK_OUI[] = {0x00, 0x0c, 0x43};
51UCHAR BROADCOM_OUI[] = {0x00, 0x90, 0x4c}; 51UCHAR BROADCOM_OUI[] = {0x00, 0x90, 0x4c};
52UCHAR WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04}; 52UCHAR WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04};
53#ifdef DOT11_N_SUPPORT
54UCHAR PRE_N_HT_OUI[] = {0x00, 0x90, 0x4c}; 53UCHAR PRE_N_HT_OUI[] = {0x00, 0x90, 0x4c};
55#endif // DOT11_N_SUPPORT //
56 54
57UCHAR RateSwitchTable[] = { 55UCHAR RateSwitchTable[] = {
58// 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) 56// 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)
@@ -128,7 +126,6 @@ UCHAR RateSwitchTable11G[] = {
128 0x07, 0x10, 7, 10, 13, 126 0x07, 0x10, 7, 10, 13,
129}; 127};
130 128
131#ifdef DOT11_N_SUPPORT
132UCHAR RateSwitchTable11N1S[] = { 129UCHAR RateSwitchTable11N1S[] = {
133// 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) 130// 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)
134 0x09, 0x00, 0, 0, 0, // Initial used item after association 131 0x09, 0x00, 0, 0, 0, // Initial used item after association
@@ -293,7 +290,6 @@ UCHAR RateSwitchTable11BGN3SForABand[] = { // 3*3
293 0x0a, 0x20, 23, 8, 25, 290 0x0a, 0x20, 23, 8, 25,
294 0x0b, 0x22, 23, 8, 25, 291 0x0b, 0x22, 23, 8, 25,
295}; 292};
296#endif // DOT11_N_SUPPORT //
297 293
298PUCHAR ReasonString[] = { 294PUCHAR ReasonString[] = {
299 /* 0 */ "Reserved", 295 /* 0 */ "Reserved",
@@ -340,11 +336,9 @@ USHORT RateIdTo500Kbps[] = { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108, 144,
340UCHAR SsidIe = IE_SSID; 336UCHAR SsidIe = IE_SSID;
341UCHAR SupRateIe = IE_SUPP_RATES; 337UCHAR SupRateIe = IE_SUPP_RATES;
342UCHAR ExtRateIe = IE_EXT_SUPP_RATES; 338UCHAR ExtRateIe = IE_EXT_SUPP_RATES;
343#ifdef DOT11_N_SUPPORT
344UCHAR HtCapIe = IE_HT_CAP; 339UCHAR HtCapIe = IE_HT_CAP;
345UCHAR AddHtInfoIe = IE_ADD_HT; 340UCHAR AddHtInfoIe = IE_ADD_HT;
346UCHAR NewExtChanIe = IE_SECONDARY_CH_OFFSET; 341UCHAR NewExtChanIe = IE_SECONDARY_CH_OFFSET;
347#endif // DOT11_N_SUPPORT //
348UCHAR ErpIe = IE_ERP; 342UCHAR ErpIe = IE_ERP;
349UCHAR DsIe = IE_DS_PARM; 343UCHAR DsIe = IE_DS_PARM;
350UCHAR TimIe = IE_TIM; 344UCHAR TimIe = IE_TIM;
@@ -861,10 +855,8 @@ VOID MlmePeriodicExec(
861 RT2870_WatchDog(pAd); 855 RT2870_WatchDog(pAd);
862#endif // RT2870 // 856#endif // RT2870 //
863 857
864#ifdef DOT11_N_SUPPORT
865 // Need statistics after read counter. So put after NICUpdateRawCounters 858 // Need statistics after read counter. So put after NICUpdateRawCounters
866 ORIBATimerTimeout(pAd); 859 ORIBATimerTimeout(pAd);
867#endif // DOT11_N_SUPPORT //
868 860
869 // if MGMT RING is full more than twice within 1 second, we consider there's 861 // if MGMT RING is full more than twice within 1 second, we consider there's
870 // a hardware problem stucking the TX path. In this case, try a hardware reset 862 // a hardware problem stucking the TX path. In this case, try a hardware reset
@@ -1135,7 +1127,6 @@ VOID STAMlmePeriodicExec(
1135 1127
1136SKIP_AUTO_SCAN_CONN: 1128SKIP_AUTO_SCAN_CONN:
1137 1129
1138#ifdef DOT11_N_SUPPORT
1139 if ((pAd->MacTab.Content[BSSID_WCID].TXBAbitmap !=0) && (pAd->MacTab.fAnyBASession == FALSE)) 1130 if ((pAd->MacTab.Content[BSSID_WCID].TXBAbitmap !=0) && (pAd->MacTab.fAnyBASession == FALSE))
1140 { 1131 {
1141 pAd->MacTab.fAnyBASession = TRUE; 1132 pAd->MacTab.fAnyBASession = TRUE;
@@ -1146,7 +1137,6 @@ SKIP_AUTO_SCAN_CONN:
1146 pAd->MacTab.fAnyBASession = FALSE; 1137 pAd->MacTab.fAnyBASession = FALSE;
1147 AsicUpdateProtect(pAd, pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode, ALLN_SETPROTECT, FALSE, FALSE); 1138 AsicUpdateProtect(pAd, pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode, ALLN_SETPROTECT, FALSE, FALSE);
1148 } 1139 }
1149#endif // DOT11_N_SUPPORT //
1150 1140
1151 return; 1141 return;
1152} 1142}
@@ -1256,7 +1246,6 @@ VOID MlmeSelectTxRateTable(
1256 1246
1257 if ((pAd->OpMode == OPMODE_STA) && ADHOC_ON(pAd)) 1247 if ((pAd->OpMode == OPMODE_STA) && ADHOC_ON(pAd))
1258 { 1248 {
1259#ifdef DOT11_N_SUPPORT
1260 if ((pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) && 1249 if ((pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) &&
1261 (pEntry->HTCapability.MCSSet[0] == 0xff) && 1250 (pEntry->HTCapability.MCSSet[0] == 0xff) &&
1262 ((pEntry->HTCapability.MCSSet[1] == 0x00) || (pAd->Antenna.field.TxPath == 1))) 1251 ((pEntry->HTCapability.MCSSet[1] == 0x00) || (pAd->Antenna.field.TxPath == 1)))
@@ -1286,11 +1275,8 @@ VOID MlmeSelectTxRateTable(
1286 1275
1287 } 1276 }
1288 else 1277 else
1289#endif // DOT11_N_SUPPORT //
1290 if ((pEntry->RateLen == 4) 1278 if ((pEntry->RateLen == 4)
1291#ifdef DOT11_N_SUPPORT
1292 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0) 1279 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0)
1293#endif // DOT11_N_SUPPORT //
1294 ) 1280 )
1295 { 1281 {
1296 *ppTable = RateSwitchTable11B; 1282 *ppTable = RateSwitchTable11B;
@@ -1315,7 +1301,6 @@ VOID MlmeSelectTxRateTable(
1315 break; 1301 break;
1316 } 1302 }
1317 1303
1318#ifdef DOT11_N_SUPPORT
1319 //if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen == 12) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0xff) && 1304 //if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen == 12) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0xff) &&
1320 // ((pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0x00) || (pAd->Antenna.field.TxPath == 1))) 1305 // ((pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0x00) || (pAd->Antenna.field.TxPath == 1)))
1321 if ((pEntry->RateLen == 12) && (pEntry->HTCapability.MCSSet[0] == 0xff) && 1306 if ((pEntry->RateLen == 12) && (pEntry->HTCapability.MCSSet[0] == 0xff) &&
@@ -1378,12 +1363,10 @@ VOID MlmeSelectTxRateTable(
1378 1363
1379 break; 1364 break;
1380 } 1365 }
1381#endif // DOT11_N_SUPPORT // 1366
1382 //else if ((pAd->StaActive.SupRateLen == 4) && (pAd->StaActive.ExtRateLen == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0)) 1367 //else if ((pAd->StaActive.SupRateLen == 4) && (pAd->StaActive.ExtRateLen == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0))
1383 if ((pEntry->RateLen == 4) 1368 if ((pEntry->RateLen == 4)
1384#ifdef DOT11_N_SUPPORT
1385 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0) 1369 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0)
1386#endif // DOT11_N_SUPPORT //
1387 ) 1370 )
1388 {// B only AP 1371 {// B only AP
1389 *ppTable = RateSwitchTable11B; 1372 *ppTable = RateSwitchTable11B;
@@ -1395,9 +1378,7 @@ VOID MlmeSelectTxRateTable(
1395 1378
1396 //else if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen > 8) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0)) 1379 //else if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen > 8) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0))
1397 if ((pEntry->RateLen > 8) 1380 if ((pEntry->RateLen > 8)
1398#ifdef DOT11_N_SUPPORT
1399 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0) 1381 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0)
1400#endif // DOT11_N_SUPPORT //
1401 ) 1382 )
1402 {// B/G mixed AP 1383 {// B/G mixed AP
1403 *ppTable = RateSwitchTable11BG; 1384 *ppTable = RateSwitchTable11BG;
@@ -1409,9 +1390,7 @@ VOID MlmeSelectTxRateTable(
1409 1390
1410 //else if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen == 8) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0)) 1391 //else if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen == 8) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0))
1411 if ((pEntry->RateLen == 8) 1392 if ((pEntry->RateLen == 8)
1412#ifdef DOT11_N_SUPPORT
1413 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0) 1393 && (pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0)
1414#endif // DOT11_N_SUPPORT //
1415 ) 1394 )
1416 {// G only AP 1395 {// G only AP
1417 *ppTable = RateSwitchTable11G; 1396 *ppTable = RateSwitchTable11G;
@@ -1420,15 +1399,11 @@ VOID MlmeSelectTxRateTable(
1420 1399
1421 break; 1400 break;
1422 } 1401 }
1423#ifdef DOT11_N_SUPPORT
1424#endif // DOT11_N_SUPPORT //
1425 1402
1426 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1403 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1427 { 1404 {
1428#ifdef DOT11_N_SUPPORT
1429 //else if ((pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0)) 1405 //else if ((pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0) && (pAd->StaActive.SupportedPhyInfo.MCSSet[1] == 0))
1430 if ((pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0)) 1406 if ((pEntry->HTCapability.MCSSet[0] == 0) && (pEntry->HTCapability.MCSSet[1] == 0))
1431#endif // DOT11_N_SUPPORT //
1432 { // Legacy mode 1407 { // Legacy mode
1433 if (pAd->CommonCfg.MaxTxRate <= RATE_11) 1408 if (pAd->CommonCfg.MaxTxRate <= RATE_11)
1434 { 1409 {
@@ -1451,7 +1426,7 @@ VOID MlmeSelectTxRateTable(
1451 } 1426 }
1452 break; 1427 break;
1453 } 1428 }
1454#ifdef DOT11_N_SUPPORT 1429
1455 if (pAd->LatchRfRegs.Channel <= 14) 1430 if (pAd->LatchRfRegs.Channel <= 14)
1456 { 1431 {
1457 if (pAd->CommonCfg.TxStream == 1) 1432 if (pAd->CommonCfg.TxStream == 1)
@@ -1486,7 +1461,7 @@ VOID MlmeSelectTxRateTable(
1486 DBGPRINT_RAW(RT_DEBUG_ERROR,("DRS: unkown mode,default use 11N 2S AP \n")); 1461 DBGPRINT_RAW(RT_DEBUG_ERROR,("DRS: unkown mode,default use 11N 2S AP \n"));
1487 } 1462 }
1488 } 1463 }
1489#endif // DOT11_N_SUPPORT // 1464
1490 DBGPRINT_RAW(RT_DEBUG_ERROR,("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n", 1465 DBGPRINT_RAW(RT_DEBUG_ERROR,("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n",
1491 pAd->StaActive.SupRateLen, pAd->StaActive.ExtRateLen, pAd->StaActive.SupportedPhyInfo.MCSSet[0], pAd->StaActive.SupportedPhyInfo.MCSSet[1])); 1466 pAd->StaActive.SupRateLen, pAd->StaActive.ExtRateLen, pAd->StaActive.SupportedPhyInfo.MCSSet[0], pAd->StaActive.SupportedPhyInfo.MCSSet[1]));
1492 } 1467 }
@@ -1710,13 +1685,11 @@ VOID MlmeSetTxRate(
1710{ 1685{
1711 UCHAR MaxMode = MODE_OFDM; 1686 UCHAR MaxMode = MODE_OFDM;
1712 1687
1713#ifdef DOT11_N_SUPPORT
1714 MaxMode = MODE_HTGREENFIELD; 1688 MaxMode = MODE_HTGREENFIELD;
1715 1689
1716 if (pTxRate->STBC && (pAd->StaCfg.MaxHTPhyMode.field.STBC) && (pAd->Antenna.field.TxPath == 2)) 1690 if (pTxRate->STBC && (pAd->StaCfg.MaxHTPhyMode.field.STBC) && (pAd->Antenna.field.TxPath == 2))
1717 pAd->StaCfg.HTPhyMode.field.STBC = STBC_USE; 1691 pAd->StaCfg.HTPhyMode.field.STBC = STBC_USE;
1718 else 1692 else
1719#endif // DOT11_N_SUPPORT //
1720 pAd->StaCfg.HTPhyMode.field.STBC = STBC_NONE; 1693 pAd->StaCfg.HTPhyMode.field.STBC = STBC_NONE;
1721 1694
1722 if (pTxRate->CurrMCS < MCS_AUTO) 1695 if (pTxRate->CurrMCS < MCS_AUTO)
@@ -1746,14 +1719,11 @@ VOID MlmeSetTxRate(
1746 if (pTxRate->Mode <= MaxMode) 1719 if (pTxRate->Mode <= MaxMode)
1747 pAd->StaCfg.HTPhyMode.field.MODE = pTxRate->Mode; 1720 pAd->StaCfg.HTPhyMode.field.MODE = pTxRate->Mode;
1748 1721
1749#ifdef DOT11_N_SUPPORT
1750 if (pTxRate->ShortGI && (pAd->StaCfg.MaxHTPhyMode.field.ShortGI)) 1722 if (pTxRate->ShortGI && (pAd->StaCfg.MaxHTPhyMode.field.ShortGI))
1751 pAd->StaCfg.HTPhyMode.field.ShortGI = GI_400; 1723 pAd->StaCfg.HTPhyMode.field.ShortGI = GI_400;
1752 else 1724 else
1753#endif // DOT11_N_SUPPORT //
1754 pAd->StaCfg.HTPhyMode.field.ShortGI = GI_800; 1725 pAd->StaCfg.HTPhyMode.field.ShortGI = GI_800;
1755 1726
1756#ifdef DOT11_N_SUPPORT
1757 // Reexam each bandwidth's SGI support. 1727 // Reexam each bandwidth's SGI support.
1758 if (pAd->StaCfg.HTPhyMode.field.ShortGI == GI_400) 1728 if (pAd->StaCfg.HTPhyMode.field.ShortGI == GI_400)
1759 { 1729 {
@@ -1797,17 +1767,15 @@ VOID MlmeSetTxRate(
1797 { 1767 {
1798 AsicUpdateProtect(pAd, HT_RTSCTS_6M, ALLN_SETPROTECT, TRUE, (BOOLEAN)pAd->MlmeAux.AddHtInfo.AddHtInfo2.NonGfPresent); 1768 AsicUpdateProtect(pAd, HT_RTSCTS_6M, ALLN_SETPROTECT, TRUE, (BOOLEAN)pAd->MlmeAux.AddHtInfo.AddHtInfo2.NonGfPresent);
1799 } 1769 }
1800#endif // DOT11_N_SUPPORT //
1801 1770
1802 pEntry->HTPhyMode.field.STBC = pAd->StaCfg.HTPhyMode.field.STBC; 1771 pEntry->HTPhyMode.field.STBC = pAd->StaCfg.HTPhyMode.field.STBC;
1803 pEntry->HTPhyMode.field.ShortGI = pAd->StaCfg.HTPhyMode.field.ShortGI; 1772 pEntry->HTPhyMode.field.ShortGI = pAd->StaCfg.HTPhyMode.field.ShortGI;
1804 pEntry->HTPhyMode.field.MCS = pAd->StaCfg.HTPhyMode.field.MCS; 1773 pEntry->HTPhyMode.field.MCS = pAd->StaCfg.HTPhyMode.field.MCS;
1805 pEntry->HTPhyMode.field.MODE = pAd->StaCfg.HTPhyMode.field.MODE; 1774 pEntry->HTPhyMode.field.MODE = pAd->StaCfg.HTPhyMode.field.MODE;
1806#ifdef DOT11_N_SUPPORT 1775
1807 if ((pAd->StaCfg.MaxHTPhyMode.field.MODE == MODE_HTGREENFIELD) && 1776 if ((pAd->StaCfg.MaxHTPhyMode.field.MODE == MODE_HTGREENFIELD) &&
1808 pAd->WIFItestbed.bGreenField) 1777 pAd->WIFItestbed.bGreenField)
1809 pEntry->HTPhyMode.field.MODE = MODE_HTGREENFIELD; 1778 pEntry->HTPhyMode.field.MODE = MODE_HTGREENFIELD;
1810#endif // DOT11_N_SUPPORT //
1811 } 1779 }
1812 1780
1813 pAd->LastTxRate = (USHORT)(pEntry->HTPhyMode.word); 1781 pAd->LastTxRate = (USHORT)(pEntry->HTPhyMode.word);
@@ -1959,14 +1927,12 @@ VOID MlmeDynamicTxRateSwitching(
1959 1927
1960 pCurrTxRate = (PRTMP_TX_RATE_SWITCH) &pTable[(CurrRateIdx+1)*5]; 1928 pCurrTxRate = (PRTMP_TX_RATE_SWITCH) &pTable[(CurrRateIdx+1)*5];
1961 1929
1962#ifdef DOT11_N_SUPPORT
1963 if ((Rssi > -65) && (pCurrTxRate->Mode >= MODE_HTMIX)) 1930 if ((Rssi > -65) && (pCurrTxRate->Mode >= MODE_HTMIX))
1964 { 1931 {
1965 TrainUp = (pCurrTxRate->TrainUp + (pCurrTxRate->TrainUp >> 1)); 1932 TrainUp = (pCurrTxRate->TrainUp + (pCurrTxRate->TrainUp >> 1));
1966 TrainDown = (pCurrTxRate->TrainDown + (pCurrTxRate->TrainDown >> 1)); 1933 TrainDown = (pCurrTxRate->TrainDown + (pCurrTxRate->TrainDown >> 1));
1967 } 1934 }
1968 else 1935 else
1969#endif // DOT11_N_SUPPORT //
1970 { 1936 {
1971 TrainUp = pCurrTxRate->TrainUp; 1937 TrainUp = pCurrTxRate->TrainUp;
1972 TrainDown = pCurrTxRate->TrainDown; 1938 TrainDown = pCurrTxRate->TrainDown;
@@ -2090,7 +2056,7 @@ VOID MlmeDynamicTxRateSwitching(
2090 RssiOffset = 8; 2056 RssiOffset = 8;
2091 } 2057 }
2092 } 2058 }
2093#ifdef DOT11_N_SUPPORT 2059
2094 /*if (MCS15)*/ 2060 /*if (MCS15)*/
2095 if ((pTable == RateSwitchTable11BGN3S) || 2061 if ((pTable == RateSwitchTable11BGN3S) ||
2096 (pTable == RateSwitchTable11N3S) || 2062 (pTable == RateSwitchTable11N3S) ||
@@ -2157,7 +2123,6 @@ VOID MlmeDynamicTxRateSwitching(
2157 TxRateIdx = MCS0; 2123 TxRateIdx = MCS0;
2158 } 2124 }
2159 else 2125 else
2160#endif // DOT11_N_SUPPORT //
2161 {// Legacy mode 2126 {// Legacy mode
2162 if (MCS7 && (Rssi > -70)) 2127 if (MCS7 && (Rssi > -70))
2163 TxRateIdx = MCS7; 2128 TxRateIdx = MCS7;
@@ -2391,14 +2356,12 @@ VOID StaQuickResponeForRateUpExec(
2391 2356
2392 pCurrTxRate = (PRTMP_TX_RATE_SWITCH) &pTable[(CurrRateIdx+1)*5]; 2357 pCurrTxRate = (PRTMP_TX_RATE_SWITCH) &pTable[(CurrRateIdx+1)*5];
2393 2358
2394#ifdef DOT11_N_SUPPORT
2395 if ((Rssi > -65) && (pCurrTxRate->Mode >= MODE_HTMIX)) 2359 if ((Rssi > -65) && (pCurrTxRate->Mode >= MODE_HTMIX))
2396 { 2360 {
2397 TrainUp = (pCurrTxRate->TrainUp + (pCurrTxRate->TrainUp >> 1)); 2361 TrainUp = (pCurrTxRate->TrainUp + (pCurrTxRate->TrainUp >> 1));
2398 TrainDown = (pCurrTxRate->TrainDown + (pCurrTxRate->TrainDown >> 1)); 2362 TrainDown = (pCurrTxRate->TrainDown + (pCurrTxRate->TrainDown >> 1));
2399 } 2363 }
2400 else 2364 else
2401#endif // DOT11_N_SUPPORT //
2402 { 2365 {
2403 TrainUp = pCurrTxRate->TrainUp; 2366 TrainUp = pCurrTxRate->TrainUp;
2404 TrainDown = pCurrTxRate->TrainDown; 2367 TrainDown = pCurrTxRate->TrainDown;
@@ -2961,9 +2924,7 @@ VOID MlmeUpdateTxRates(
2961 { 2924 {
2962 case PHY_11BG_MIXED: 2925 case PHY_11BG_MIXED:
2963 case PHY_11B: 2926 case PHY_11B:
2964#ifdef DOT11_N_SUPPORT
2965 case PHY_11BGN_MIXED: 2927 case PHY_11BGN_MIXED:
2966#endif // DOT11_N_SUPPORT //
2967 pAd->CommonCfg.MlmeRate = RATE_1; 2928 pAd->CommonCfg.MlmeRate = RATE_1;
2968 pAd->CommonCfg.MlmeTransmit.field.MODE = MODE_CCK; 2929 pAd->CommonCfg.MlmeTransmit.field.MODE = MODE_CCK;
2969 pAd->CommonCfg.MlmeTransmit.field.MCS = RATE_1; 2930 pAd->CommonCfg.MlmeTransmit.field.MCS = RATE_1;
@@ -2976,22 +2937,18 @@ VOID MlmeUpdateTxRates(
2976 break; 2937 break;
2977 case PHY_11G: 2938 case PHY_11G:
2978 case PHY_11A: 2939 case PHY_11A:
2979#ifdef DOT11_N_SUPPORT
2980 case PHY_11AGN_MIXED: 2940 case PHY_11AGN_MIXED:
2981 case PHY_11GN_MIXED: 2941 case PHY_11GN_MIXED:
2982 case PHY_11N_2_4G: 2942 case PHY_11N_2_4G:
2983 case PHY_11AN_MIXED: 2943 case PHY_11AN_MIXED:
2984 case PHY_11N_5G: 2944 case PHY_11N_5G:
2985#endif // DOT11_N_SUPPORT //
2986 pAd->CommonCfg.MlmeRate = RATE_6; 2945 pAd->CommonCfg.MlmeRate = RATE_6;
2987 pAd->CommonCfg.RtsRate = RATE_6; 2946 pAd->CommonCfg.RtsRate = RATE_6;
2988 pAd->CommonCfg.MlmeTransmit.field.MODE = MODE_OFDM; 2947 pAd->CommonCfg.MlmeTransmit.field.MODE = MODE_OFDM;
2989 pAd->CommonCfg.MlmeTransmit.field.MCS = OfdmRateToRxwiMCS[pAd->CommonCfg.MlmeRate]; 2948 pAd->CommonCfg.MlmeTransmit.field.MCS = OfdmRateToRxwiMCS[pAd->CommonCfg.MlmeRate];
2990 break; 2949 break;
2991 case PHY_11ABG_MIXED: 2950 case PHY_11ABG_MIXED:
2992#ifdef DOT11_N_SUPPORT
2993 case PHY_11ABGN_MIXED: 2951 case PHY_11ABGN_MIXED:
2994#endif // DOT11_N_SUPPORT //
2995 if (pAd->CommonCfg.Channel <= 14) 2952 if (pAd->CommonCfg.Channel <= 14)
2996 { 2953 {
2997 pAd->CommonCfg.MlmeRate = RATE_1; 2954 pAd->CommonCfg.MlmeRate = RATE_1;
@@ -3034,7 +2991,6 @@ VOID MlmeUpdateTxRates(
3034 pAd->CommonCfg.MlmeTransmit.word, pAd->MacTab.Content[BSSID_WCID].MinHTPhyMode.word ,pAd->MacTab.Content[BSSID_WCID].MaxHTPhyMode.word ,pAd->MacTab.Content[BSSID_WCID].HTPhyMode.word )); 2991 pAd->CommonCfg.MlmeTransmit.word, pAd->MacTab.Content[BSSID_WCID].MinHTPhyMode.word ,pAd->MacTab.Content[BSSID_WCID].MaxHTPhyMode.word ,pAd->MacTab.Content[BSSID_WCID].HTPhyMode.word ));
3035} 2992}
3036 2993
3037#ifdef DOT11_N_SUPPORT
3038/* 2994/*
3039 ========================================================================== 2995 ==========================================================================
3040 Description: 2996 Description:
@@ -3185,7 +3141,6 @@ VOID MlmeUpdateHtTxRates(
3185 pHtPhy->field.BW, pHtPhy->field.ShortGI, pHtPhy->field.MODE)); 3141 pHtPhy->field.BW, pHtPhy->field.ShortGI, pHtPhy->field.MODE));
3186 DBGPRINT(RT_DEBUG_TRACE,("MlmeUpdateHtTxRates<=== \n")); 3142 DBGPRINT(RT_DEBUG_TRACE,("MlmeUpdateHtTxRates<=== \n"));
3187} 3143}
3188#endif // DOT11_N_SUPPORT //
3189 3144
3190// IRQL = DISPATCH_LEVEL 3145// IRQL = DISPATCH_LEVEL
3191VOID MlmeRadioOff( 3146VOID MlmeRadioOff(
@@ -3230,7 +3185,6 @@ VOID BssTableInit(
3230 } 3185 }
3231} 3186}
3232 3187
3233#ifdef DOT11_N_SUPPORT
3234VOID BATableInit( 3188VOID BATableInit(
3235 IN PRTMP_ADAPTER pAd, 3189 IN PRTMP_ADAPTER pAd,
3236 IN BA_TABLE *Tab) 3190 IN BA_TABLE *Tab)
@@ -3250,7 +3204,6 @@ VOID BATableInit(
3250 Tab->BAOriEntry[i].ORI_BA_Status = Originator_NONE; 3204 Tab->BAOriEntry[i].ORI_BA_Status = Originator_NONE;
3251 } 3205 }
3252} 3206}
3253#endif // DOT11_N_SUPPORT //
3254 3207
3255/*! \brief search the BSS table by SSID 3208/*! \brief search the BSS table by SSID
3256 * \param p_tab pointer to the bss table 3209 * \param p_tab pointer to the bss table
@@ -3360,7 +3313,6 @@ VOID BssTableDeleteEntry(
3360 } 3313 }
3361} 3314}
3362 3315
3363#ifdef DOT11_N_SUPPORT
3364/* 3316/*
3365 ======================================================================== 3317 ========================================================================
3366 Routine Description: 3318 Routine Description:
@@ -3392,7 +3344,6 @@ VOID BATableDeleteORIEntry(
3392 NdisReleaseSpinLock(&pAd->BATabLock); 3344 NdisReleaseSpinLock(&pAd->BATabLock);
3393 } 3345 }
3394} 3346}
3395#endif // DOT11_N_SUPPORT //
3396 3347
3397/*! \brief 3348/*! \brief
3398 * \param 3349 * \param
@@ -3509,7 +3460,7 @@ VOID BssEntrySet(
3509 3460
3510 pBss->AddHtInfoLen = 0; 3461 pBss->AddHtInfoLen = 0;
3511 pBss->HtCapabilityLen = 0; 3462 pBss->HtCapabilityLen = 0;
3512#ifdef DOT11_N_SUPPORT 3463
3513 if (HtCapabilityLen> 0) 3464 if (HtCapabilityLen> 0)
3514 { 3465 {
3515 pBss->HtCapabilityLen = HtCapabilityLen; 3466 pBss->HtCapabilityLen = HtCapabilityLen;
@@ -3529,7 +3480,6 @@ VOID BssEntrySet(
3529 } 3480 }
3530 } 3481 }
3531 } 3482 }
3532#endif // DOT11_N_SUPPORT //
3533 3483
3534 BssCipherParse(pBss); 3484 BssCipherParse(pBss);
3535 3485
@@ -3720,7 +3670,7 @@ VOID BssTableSsidSort(
3720 (SSID_EQUAL(Ssid, SsidLen, pInBss->Ssid, pInBss->SsidLen) || bIsHiddenApIncluded)) 3670 (SSID_EQUAL(Ssid, SsidLen, pInBss->Ssid, pInBss->SsidLen) || bIsHiddenApIncluded))
3721 { 3671 {
3722 BSS_ENTRY *pOutBss = &OutTab->BssEntry[OutTab->BssNr]; 3672 BSS_ENTRY *pOutBss = &OutTab->BssEntry[OutTab->BssNr];
3723#ifdef DOT11_N_SUPPORT 3673
3724 // 2.4G/5G N only mode 3674 // 2.4G/5G N only mode
3725 if ((pInBss->HtCapabilityLen == 0) && 3675 if ((pInBss->HtCapabilityLen == 0) &&
3726 ((pAd->CommonCfg.PhyMode == PHY_11N_2_4G) || (pAd->CommonCfg.PhyMode == PHY_11N_5G))) 3676 ((pAd->CommonCfg.PhyMode == PHY_11N_2_4G) || (pAd->CommonCfg.PhyMode == PHY_11N_5G)))
@@ -3728,7 +3678,6 @@ VOID BssTableSsidSort(
3728 DBGPRINT(RT_DEBUG_TRACE,("STA is in N-only Mode, this AP don't have Ht capability in Beacon.\n")); 3678 DBGPRINT(RT_DEBUG_TRACE,("STA is in N-only Mode, this AP don't have Ht capability in Beacon.\n"));
3729 continue; 3679 continue;
3730 } 3680 }
3731#endif // DOT11_N_SUPPORT //
3732 3681
3733 // New for WPA2 3682 // New for WPA2
3734 // Check the Authmode first 3683 // Check the Authmode first
@@ -3801,7 +3750,6 @@ VOID BssTableSsidSort(
3801 if (SsidLen == 0) 3750 if (SsidLen == 0)
3802 continue; 3751 continue;
3803 3752
3804#ifdef DOT11_N_SUPPORT
3805 // If both station and AP use 40MHz, still need to check if the 40MHZ band's legality in my country region 3753 // If both station and AP use 40MHz, still need to check if the 40MHZ band's legality in my country region
3806 // If this 40MHz wideband is not allowed in my country list, use bandwidth 20MHZ instead, 3754 // If this 40MHz wideband is not allowed in my country list, use bandwidth 20MHZ instead,
3807 if ((pInBss->CentralChannel != pInBss->Channel) && 3755 if ((pInBss->CentralChannel != pInBss->Channel) &&
@@ -3821,7 +3769,6 @@ VOID BssTableSsidSort(
3821 } 3769 }
3822 } 3770 }
3823 } 3771 }
3824#endif // DOT11_N_SUPPORT //
3825 3772
3826 // copy matching BSS from InTab to OutTab 3773 // copy matching BSS from InTab to OutTab
3827 NdisMoveMemory(pOutBss, pInBss, sizeof(BSS_ENTRY)); 3774 NdisMoveMemory(pOutBss, pInBss, sizeof(BSS_ENTRY));
@@ -3832,8 +3779,6 @@ VOID BssTableSsidSort(
3832 { 3779 {
3833 BSS_ENTRY *pOutBss = &OutTab->BssEntry[OutTab->BssNr]; 3780 BSS_ENTRY *pOutBss = &OutTab->BssEntry[OutTab->BssNr];
3834 3781
3835
3836#ifdef DOT11_N_SUPPORT
3837 // 2.4G/5G N only mode 3782 // 2.4G/5G N only mode
3838 if ((pInBss->HtCapabilityLen == 0) && 3783 if ((pInBss->HtCapabilityLen == 0) &&
3839 ((pAd->CommonCfg.PhyMode == PHY_11N_2_4G) || (pAd->CommonCfg.PhyMode == PHY_11N_5G))) 3784 ((pAd->CommonCfg.PhyMode == PHY_11N_2_4G) || (pAd->CommonCfg.PhyMode == PHY_11N_5G)))
@@ -3841,7 +3786,6 @@ VOID BssTableSsidSort(
3841 DBGPRINT(RT_DEBUG_TRACE,("STA is in N-only Mode, this AP don't have Ht capability in Beacon.\n")); 3786 DBGPRINT(RT_DEBUG_TRACE,("STA is in N-only Mode, this AP don't have Ht capability in Beacon.\n"));
3842 continue; 3787 continue;
3843 } 3788 }
3844#endif // DOT11_N_SUPPORT //
3845 3789
3846 // New for WPA2 3790 // New for WPA2
3847 // Check the Authmode first 3791 // Check the Authmode first
@@ -3897,7 +3841,6 @@ VOID BssTableSsidSort(
3897 else if (pAd->StaCfg.WepStatus != pInBss->WepStatus) 3841 else if (pAd->StaCfg.WepStatus != pInBss->WepStatus)
3898 continue; 3842 continue;
3899 3843
3900#ifdef DOT11_N_SUPPORT
3901 // If both station and AP use 40MHz, still need to check if the 40MHZ band's legality in my country region 3844 // If both station and AP use 40MHz, still need to check if the 40MHZ band's legality in my country region
3902 // If this 40MHz wideband is not allowed in my country list, use bandwidth 20MHZ instead, 3845 // If this 40MHz wideband is not allowed in my country list, use bandwidth 20MHZ instead,
3903 if ((pInBss->CentralChannel != pInBss->Channel) && 3846 if ((pInBss->CentralChannel != pInBss->Channel) &&
@@ -3910,7 +3853,6 @@ VOID BssTableSsidSort(
3910 pAd->CommonCfg.RegTransmitSetting.field.BW = BW_40; 3853 pAd->CommonCfg.RegTransmitSetting.field.BW = BW_40;
3911 } 3854 }
3912 } 3855 }
3913#endif // DOT11_N_SUPPORT //
3914 3856
3915 // copy matching BSS from InTab to OutTab 3857 // copy matching BSS from InTab to OutTab
3916 NdisMoveMemory(pOutBss, pInBss, sizeof(BSS_ENTRY)); 3858 NdisMoveMemory(pOutBss, pInBss, sizeof(BSS_ENTRY));
@@ -5076,7 +5018,6 @@ VOID AsicUpdateAutoFallBackTable(
5076 } 5018 }
5077 } 5019 }
5078 break; 5020 break;
5079#ifdef DOT11_N_SUPPORT
5080 case 2: //HT-MIX 5021 case 2: //HT-MIX
5081 case 3: //HT-GF 5022 case 3: //HT-GF
5082 { 5023 {
@@ -5138,7 +5079,6 @@ VOID AsicUpdateAutoFallBackTable(
5138 } 5079 }
5139 } 5080 }
5140 break; 5081 break;
5141#endif // DOT11_N_SUPPORT //
5142 } 5082 }
5143 5083
5144 pNextTxRate = pCurrTxRate; 5084 pNextTxRate = pCurrTxRate;
@@ -5180,7 +5120,6 @@ VOID AsicUpdateProtect(
5180 UCHAR i; 5120 UCHAR i;
5181 UINT32 MacReg = 0; 5121 UINT32 MacReg = 0;
5182 5122
5183#ifdef DOT11_N_SUPPORT
5184 if (!(pAd->CommonCfg.bHTProtect) && (OperationMode != 8)) 5123 if (!(pAd->CommonCfg.bHTProtect) && (OperationMode != 8))
5185 { 5124 {
5186 return; 5125 return;
@@ -5194,7 +5133,6 @@ VOID AsicUpdateProtect(
5194 SetMask = ALLN_SETPROTECT; 5133 SetMask = ALLN_SETPROTECT;
5195 OperationMode = 8; 5134 OperationMode = 8;
5196 } 5135 }
5197#endif // DOT11_N_SUPPORT //
5198 5136
5199 // Config ASIC RTS threshold register 5137 // Config ASIC RTS threshold register
5200 RTMP_IO_READ32(pAd, TX_RTS_CFG, &MacReg); 5138 RTMP_IO_READ32(pAd, TX_RTS_CFG, &MacReg);
@@ -5204,9 +5142,7 @@ VOID AsicUpdateProtect(
5204#else 5142#else
5205 // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 5143 // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096
5206 if (( 5144 if ((
5207#ifdef DOT11_N_SUPPORT
5208 (pAd->CommonCfg.BACapability.field.AmsduEnable) || 5145 (pAd->CommonCfg.BACapability.field.AmsduEnable) ||
5209#endif // DOT11_N_SUPPORT //
5210 (pAd->CommonCfg.bAggregationCapable == TRUE)) 5146 (pAd->CommonCfg.bAggregationCapable == TRUE))
5211 && pAd->CommonCfg.RtsThreshold == MAX_RTS_THRESHOLD) 5147 && pAd->CommonCfg.RtsThreshold == MAX_RTS_THRESHOLD)
5212 { 5148 {
@@ -5255,7 +5191,6 @@ VOID AsicUpdateProtect(
5255 Protect[1] = ProtCfg.word; 5191 Protect[1] = ProtCfg.word;
5256 } 5192 }
5257 5193
5258#ifdef DOT11_N_SUPPORT
5259 // Decide HT frame protection. 5194 // Decide HT frame protection.
5260 if ((SetMask & ALLN_SETPROTECT) != 0) 5195 if ((SetMask & ALLN_SETPROTECT) != 0)
5261 { 5196 {
@@ -5386,7 +5321,6 @@ VOID AsicUpdateProtect(
5386 break; 5321 break;
5387 } 5322 }
5388 } 5323 }
5389#endif // DOT11_N_SUPPORT //
5390 5324
5391 offset = CCK_PROT_CFG; 5325 offset = CCK_PROT_CFG;
5392 for (i = 0;i < 6;i++) 5326 for (i = 0;i < 6;i++)
@@ -6203,9 +6137,7 @@ VOID AsicDisableRDG(
6203 // Data |= 0x60; // for performance issue not set the TXOP to 0 6137 // Data |= 0x60; // for performance issue not set the TXOP to 0
6204#endif 6138#endif
6205 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_DYNAMIC_BE_TXOP_ACTIVE) 6139 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_DYNAMIC_BE_TXOP_ACTIVE)
6206#ifdef DOT11_N_SUPPORT
6207 && (pAd->MacTab.fAnyStationMIMOPSDynamic == FALSE) 6140 && (pAd->MacTab.fAnyStationMIMOPSDynamic == FALSE)
6208#endif // DOT11_N_SUPPORT //
6209 ) 6141 )
6210 { 6142 {
6211 // For CWC test, change txop from 0x30 to 0x20 in TxBurst mode 6143 // For CWC test, change txop from 0x30 to 0x20 in TxBurst mode
@@ -6643,9 +6575,7 @@ VOID AsicSetSlotTime(
6643 { 6575 {
6644 // force using short SLOT time for FAE to demo performance when TxBurst is ON 6576 // force using short SLOT time for FAE to demo performance when TxBurst is ON
6645 if (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED))) 6577 if (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED)))
6646#ifdef DOT11_N_SUPPORT
6647 || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE)) 6578 || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE))
6648#endif // DOT11_N_SUPPORT //
6649 ) 6579 )
6650 { 6580 {
6651 // In this case, we will think it is doing Wi-Fi test 6581 // In this case, we will think it is doing Wi-Fi test
@@ -7185,7 +7115,6 @@ VOID RTMPCheckRates(
7185 NdisMoveMemory(SupRate, NewRate, NewRateLen); 7115 NdisMoveMemory(SupRate, NewRate, NewRateLen);
7186} 7116}
7187 7117
7188#ifdef DOT11_N_SUPPORT
7189BOOLEAN RTMPCheckChannel( 7118BOOLEAN RTMPCheckChannel(
7190 IN PRTMP_ADAPTER pAd, 7119 IN PRTMP_ADAPTER pAd,
7191 IN UCHAR CentralChannel, 7120 IN UCHAR CentralChannel,
@@ -7331,7 +7260,6 @@ BOOLEAN RTMPCheckHt(
7331 COPY_AP_HTSETTINGS_FROM_BEACON(pAd, pHtCapability); 7260 COPY_AP_HTSETTINGS_FROM_BEACON(pAd, pHtCapability);
7332 return TRUE; 7261 return TRUE;
7333} 7262}
7334#endif // DOT11_N_SUPPORT //
7335 7263
7336/* 7264/*
7337 ======================================================================== 7265 ========================================================================
@@ -7364,10 +7292,8 @@ VOID RTMPUpdateMlmeRate(
7364 MinimumRate = RATE_1; 7292 MinimumRate = RATE_1;
7365 break; 7293 break;
7366 case PHY_11BG_MIXED: 7294 case PHY_11BG_MIXED:
7367#ifdef DOT11_N_SUPPORT
7368 case PHY_11ABGN_MIXED: 7295 case PHY_11ABGN_MIXED:
7369 case PHY_11BGN_MIXED: 7296 case PHY_11BGN_MIXED:
7370#endif // DOT11_N_SUPPORT //
7371 if ((pAd->MlmeAux.SupRateLen == 4) && 7297 if ((pAd->MlmeAux.SupRateLen == 4) &&
7372 (pAd->MlmeAux.ExtRateLen == 0)) 7298 (pAd->MlmeAux.ExtRateLen == 0))
7373 // B only AP 7299 // B only AP
@@ -7381,13 +7307,11 @@ VOID RTMPUpdateMlmeRate(
7381 MinimumRate = RATE_6; 7307 MinimumRate = RATE_6;
7382 break; 7308 break;
7383 case PHY_11A: 7309 case PHY_11A:
7384#ifdef DOT11_N_SUPPORT
7385 case PHY_11N_2_4G: // rt2860 need to check mlmerate for 802.11n 7310 case PHY_11N_2_4G: // rt2860 need to check mlmerate for 802.11n
7386 case PHY_11GN_MIXED: 7311 case PHY_11GN_MIXED:
7387 case PHY_11AGN_MIXED: 7312 case PHY_11AGN_MIXED:
7388 case PHY_11AN_MIXED: 7313 case PHY_11AN_MIXED:
7389 case PHY_11N_5G: 7314 case PHY_11N_5G:
7390#endif // DOT11_N_SUPPORT //
7391 ProperMlmeRate = RATE_24; 7315 ProperMlmeRate = RATE_24;
7392 MinimumRate = RATE_6; 7316 MinimumRate = RATE_6;
7393 break; 7317 break;
@@ -7982,13 +7906,11 @@ VOID RTMPSetAGCInitValue(
7982 R66 = (UCHAR)(0x32 + (GET_LNA_GAIN(pAd)*5)/3); 7906 R66 = (UCHAR)(0x32 + (GET_LNA_GAIN(pAd)*5)/3);
7983 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, R66); 7907 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, R66);
7984 } 7908 }
7985#ifdef DOT11_N_SUPPORT
7986 else 7909 else
7987 { 7910 {
7988 R66 = (UCHAR)(0x3A + (GET_LNA_GAIN(pAd)*5)/3); 7911 R66 = (UCHAR)(0x3A + (GET_LNA_GAIN(pAd)*5)/3);
7989 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, R66); 7912 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R66, R66);
7990 } 7913 }
7991#endif // DOT11_N_SUPPORT //
7992 } 7914 }
7993 7915
7994} 7916}
diff --git a/drivers/staging/rt2870/common/rtmp_init.c b/drivers/staging/rt2870/common/rtmp_init.c
index 27cbb479327..e3b846ec363 100644
--- a/drivers/staging/rt2870/common/rtmp_init.c
+++ b/drivers/staging/rt2870/common/rtmp_init.c
@@ -1504,13 +1504,11 @@ VOID NICReadEEPROMParameters(
1504 if ((pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED) || 1504 if ((pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED) ||
1505 (pAd->CommonCfg.PhyMode == PHY_11A)) 1505 (pAd->CommonCfg.PhyMode == PHY_11A))
1506 pAd->CommonCfg.PhyMode = PHY_11BG_MIXED; 1506 pAd->CommonCfg.PhyMode = PHY_11BG_MIXED;
1507#ifdef DOT11_N_SUPPORT
1508 else if ((pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED) || 1507 else if ((pAd->CommonCfg.PhyMode == PHY_11ABGN_MIXED) ||
1509 (pAd->CommonCfg.PhyMode == PHY_11AN_MIXED) || 1508 (pAd->CommonCfg.PhyMode == PHY_11AN_MIXED) ||
1510 (pAd->CommonCfg.PhyMode == PHY_11AGN_MIXED) || 1509 (pAd->CommonCfg.PhyMode == PHY_11AGN_MIXED) ||
1511 (pAd->CommonCfg.PhyMode == PHY_11N_5G)) 1510 (pAd->CommonCfg.PhyMode == PHY_11N_5G))
1512 pAd->CommonCfg.PhyMode = PHY_11BGN_MIXED; 1511 pAd->CommonCfg.PhyMode = PHY_11BGN_MIXED;
1513#endif // DOT11_N_SUPPORT //
1514 } 1512 }
1515 1513
1516 // Read TSSI reference and TSSI boundary for temperature compensation. This is ugly 1514 // Read TSSI reference and TSSI boundary for temperature compensation. This is ugly
@@ -1601,9 +1599,7 @@ VOID NICReadEEPROMParameters(
1601 TmpPhy = pAd->CommonCfg.PhyMode; 1599 TmpPhy = pAd->CommonCfg.PhyMode;
1602 pAd->CommonCfg.PhyMode = 0xff; 1600 pAd->CommonCfg.PhyMode = 0xff;
1603 RTMPSetPhyMode(pAd, TmpPhy); 1601 RTMPSetPhyMode(pAd, TmpPhy);
1604#ifdef DOT11_N_SUPPORT
1605 SetCommonHT(pAd); 1602 SetCommonHT(pAd);
1606#endif // DOT11_N_SUPPORT //
1607 } 1603 }
1608 1604
1609 // 1605 //
@@ -2275,10 +2271,8 @@ VOID NICUpdateFifoStaCounters(
2275 2271
2276 pEntry->DebugFIFOCount++; 2272 pEntry->DebugFIFOCount++;
2277 2273
2278#ifdef DOT11_N_SUPPORT
2279 if (StaFifo.field.TxBF) // 3*3 2274 if (StaFifo.field.TxBF) // 3*3
2280 pEntry->TxBFCount++; 2275 pEntry->TxBFCount++;
2281#endif // DOT11_N_SUPPORT //
2282 2276
2283#ifdef UAPSD_AP_SUPPORT 2277#ifdef UAPSD_AP_SUPPORT
2284 UAPSD_SP_AUE_Handle(pAd, pEntry, StaFifo.field.TxSuccess); 2278 UAPSD_SP_AUE_Handle(pAd, pEntry, StaFifo.field.TxSuccess);
@@ -2296,19 +2290,15 @@ VOID NICUpdateFifoStaCounters(
2296 SendRefreshBAR(pAd, pEntry); 2290 SendRefreshBAR(pAd, pEntry);
2297 pEntry->NoBADataCountDown = 64; 2291 pEntry->NoBADataCountDown = 64;
2298#else 2292#else
2299#ifdef DOT11_N_SUPPORT
2300 pEntry->NoBADataCountDown = 64; 2293 pEntry->NoBADataCountDown = 64;
2301#endif // DOT11_N_SUPPORT //
2302 2294
2303 if(pEntry->PsMode == PWR_ACTIVE) 2295 if(pEntry->PsMode == PWR_ACTIVE)
2304 { 2296 {
2305#ifdef DOT11_N_SUPPORT
2306 int tid; 2297 int tid;
2307 for (tid=0; tid<NUM_OF_TID; tid++) 2298 for (tid=0; tid<NUM_OF_TID; tid++)
2308 { 2299 {
2309 BAOriSessionTearDown(pAd, pEntry->Aid, tid, FALSE, FALSE); 2300 BAOriSessionTearDown(pAd, pEntry->Aid, tid, FALSE, FALSE);
2310 } 2301 }
2311#endif // DOT11_N_SUPPORT //
2312 2302
2313 // Update the continuous transmission counter except PS mode 2303 // Update the continuous transmission counter except PS mode
2314 pEntry->ContinueTxFailCnt++; 2304 pEntry->ContinueTxFailCnt++;
@@ -2327,7 +2317,6 @@ VOID NICUpdateFifoStaCounters(
2327 } 2317 }
2328 else 2318 else
2329 { 2319 {
2330#ifdef DOT11_N_SUPPORT
2331 if ((pEntry->PsMode != PWR_SAVE) && (pEntry->NoBADataCountDown > 0)) 2320 if ((pEntry->PsMode != PWR_SAVE) && (pEntry->NoBADataCountDown > 0))
2332 { 2321 {
2333 pEntry->NoBADataCountDown--; 2322 pEntry->NoBADataCountDown--;
@@ -2336,7 +2325,7 @@ VOID NICUpdateFifoStaCounters(
2336 DBGPRINT(RT_DEBUG_TRACE, ("@\n")); 2325 DBGPRINT(RT_DEBUG_TRACE, ("@\n"));
2337 } 2326 }
2338 } 2327 }
2339#endif // DOT11_N_SUPPORT // 2328
2340 pEntry->FIFOCount = 0; 2329 pEntry->FIFOCount = 0;
2341 pEntry->OneSecTxNoRetryOkCount++; 2330 pEntry->OneSecTxNoRetryOkCount++;
2342 // update NoDataIdleCount when sucessful send packet to STA. 2331 // update NoDataIdleCount when sucessful send packet to STA.
@@ -3191,7 +3180,6 @@ VOID UserCfgInit(
3191 3180
3192 NdisZeroMemory(&pAd->BeaconTxWI, sizeof(pAd->BeaconTxWI)); 3181 NdisZeroMemory(&pAd->BeaconTxWI, sizeof(pAd->BeaconTxWI));
3193 3182
3194#ifdef DOT11_N_SUPPORT
3195 NdisZeroMemory(&pAd->CommonCfg.HtCapability, sizeof(pAd->CommonCfg.HtCapability)); 3183 NdisZeroMemory(&pAd->CommonCfg.HtCapability, sizeof(pAd->CommonCfg.HtCapability));
3196 pAd->HTCEnable = FALSE; 3184 pAd->HTCEnable = FALSE;
3197 pAd->bBroadComHT = FALSE; 3185 pAd->bBroadComHT = FALSE;
@@ -3217,7 +3205,6 @@ VOID UserCfgInit(
3217 pAd->CommonCfg.TxBASize = 7; 3205 pAd->CommonCfg.TxBASize = 7;
3218 3206
3219 pAd->CommonCfg.REGBACapability.word = pAd->CommonCfg.BACapability.word; 3207 pAd->CommonCfg.REGBACapability.word = pAd->CommonCfg.BACapability.word;
3220#endif // DOT11_N_SUPPORT //
3221 3208
3222 //pAd->CommonCfg.HTPhyMode.field.BW = BW_20; 3209 //pAd->CommonCfg.HTPhyMode.field.BW = BW_20;
3223 //pAd->CommonCfg.HTPhyMode.field.MCS = MCS_AUTO; 3210 //pAd->CommonCfg.HTPhyMode.field.MCS = MCS_AUTO;
diff --git a/drivers/staging/rt2870/common/spectrum.c b/drivers/staging/rt2870/common/spectrum.c
index f2e0a8b7503..c2a9443b36a 100644
--- a/drivers/staging/rt2870/common/spectrum.c
+++ b/drivers/staging/rt2870/common/spectrum.c
@@ -1068,9 +1068,9 @@ static VOID StartDFSProcedure(
1068{ 1068{
1069 // start DFS procedure 1069 // start DFS procedure
1070 pAd->CommonCfg.Channel = Channel; 1070 pAd->CommonCfg.Channel = Channel;
1071#ifdef DOT11_N_SUPPORT 1071
1072 N_ChannelCheck(pAd); 1072 N_ChannelCheck(pAd);
1073#endif // DOT11_N_SUPPORT // 1073
1074 pAd->CommonCfg.RadarDetect.RDMode = RD_SWITCHING_MODE; 1074 pAd->CommonCfg.RadarDetect.RDMode = RD_SWITCHING_MODE;
1075 pAd->CommonCfg.RadarDetect.CSCount = 0; 1075 pAd->CommonCfg.RadarDetect.CSCount = 0;
1076} 1076}
diff --git a/drivers/staging/rt2870/oid.h b/drivers/staging/rt2870/oid.h
index cdd9c193581..21c72787927 100644
--- a/drivers/staging/rt2870/oid.h
+++ b/drivers/staging/rt2870/oid.h
@@ -712,7 +712,6 @@ typedef enum _RT_802_11_PHY_MODE {
712 PHY_11A, 712 PHY_11A,
713 PHY_11ABG_MIXED, 713 PHY_11ABG_MIXED,
714 PHY_11G, 714 PHY_11G,
715#ifdef DOT11_N_SUPPORT
716 PHY_11ABGN_MIXED, // both band 5 715 PHY_11ABGN_MIXED, // both band 5
717 PHY_11N_2_4G, // 11n-only with 2.4G band 6 716 PHY_11N_2_4G, // 11n-only with 2.4G band 6
718 PHY_11GN_MIXED, // 2.4G band 7 717 PHY_11GN_MIXED, // 2.4G band 7
@@ -720,7 +719,6 @@ typedef enum _RT_802_11_PHY_MODE {
720 PHY_11BGN_MIXED, // if check 802.11b. 9 719 PHY_11BGN_MIXED, // if check 802.11b. 9
721 PHY_11AGN_MIXED, // if check 802.11b. 10 720 PHY_11AGN_MIXED, // if check 802.11b. 10
722 PHY_11N_5G, // 11n-only with 5G band 11 721 PHY_11N_5G, // 11n-only with 5G band 11
723#endif // DOT11_N_SUPPORT //
724} RT_802_11_PHY_MODE; 722} RT_802_11_PHY_MODE;
725 723
726// put all proprietery for-query objects here to reduce # of Query_OID 724// put all proprietery for-query objects here to reduce # of Query_OID
diff --git a/drivers/staging/rt2870/rt_linux.c b/drivers/staging/rt2870/rt_linux.c
index fb8f604f30b..6c39ebbb9bd 100644
--- a/drivers/staging/rt2870/rt_linux.c
+++ b/drivers/staging/rt2870/rt_linux.c
@@ -983,13 +983,11 @@ void send_monitor_packets(
983 ph->noise.len = 4; 983 ph->noise.len = 4;
984 ph->noise.data = 0; 984 ph->noise.data = 0;
985 985
986#ifdef DOT11_N_SUPPORT
987 if (pRxBlk->pRxWI->PHYMODE >= MODE_HTMIX) 986 if (pRxBlk->pRxWI->PHYMODE >= MODE_HTMIX)
988 { 987 {
989 rate_index = 16 + ((UCHAR)pRxBlk->pRxWI->BW *16) + ((UCHAR)pRxBlk->pRxWI->ShortGI *32) + ((UCHAR)pRxBlk->pRxWI->MCS); 988 rate_index = 16 + ((UCHAR)pRxBlk->pRxWI->BW *16) + ((UCHAR)pRxBlk->pRxWI->ShortGI *32) + ((UCHAR)pRxBlk->pRxWI->MCS);
990 } 989 }
991 else 990 else
992#endif // DOT11_N_SUPPORT //
993 if (pRxBlk->pRxWI->PHYMODE == MODE_OFDM) 991 if (pRxBlk->pRxWI->PHYMODE == MODE_OFDM)
994 rate_index = (UCHAR)(pRxBlk->pRxWI->MCS) + 4; 992 rate_index = (UCHAR)(pRxBlk->pRxWI->MCS) + 4;
995 else 993 else
diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index 474c3adbebe..15dc986aaf3 100644
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -54,10 +54,8 @@ MODULE_PARM_DESC (mac, "rt28xx: wireless mac addr");
54/*---------------------------------------------------------------------*/ 54/*---------------------------------------------------------------------*/
55/* Prototypes of Functions Used */ 55/* Prototypes of Functions Used */
56/*---------------------------------------------------------------------*/ 56/*---------------------------------------------------------------------*/
57#ifdef DOT11_N_SUPPORT
58extern BOOLEAN ba_reordering_resource_init(PRTMP_ADAPTER pAd, int num); 57extern BOOLEAN ba_reordering_resource_init(PRTMP_ADAPTER pAd, int num);
59extern void ba_reordering_resource_release(PRTMP_ADAPTER pAd); 58extern void ba_reordering_resource_release(PRTMP_ADAPTER pAd);
60#endif // DOT11_N_SUPPORT //
61extern NDIS_STATUS NICLoadRateSwitchingParams(IN PRTMP_ADAPTER pAd); 59extern NDIS_STATUS NICLoadRateSwitchingParams(IN PRTMP_ADAPTER pAd);
62 60
63 61
@@ -323,10 +321,8 @@ int rt28xx_close(IN PNET_DEV dev)
323 321
324 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS); 322 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS);
325 323
326#ifdef DOT11_N_SUPPORT
327 // Free BA reorder resource 324 // Free BA reorder resource
328 ba_reordering_resource_release(pAd); 325 ba_reordering_resource_release(pAd);
329#endif // DOT11_N_SUPPORT //
330 326
331 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_START_UP); 327 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_START_UP);
332 328
@@ -341,10 +337,8 @@ static int rt28xx_init(IN struct net_device *net_dev)
341 NDIS_STATUS Status; 337 NDIS_STATUS Status;
342 UINT32 MacCsr0 = 0; 338 UINT32 MacCsr0 = 0;
343 339
344#ifdef DOT11_N_SUPPORT
345 // Allocate BA Reordering memory 340 // Allocate BA Reordering memory
346 ba_reordering_resource_init(pAd, MAX_REORDERING_MPDU_NUM); 341 ba_reordering_resource_init(pAd, MAX_REORDERING_MPDU_NUM);
347#endif // DOT11_N_SUPPORT //
348 342
349 // Make sure MAC gets ready. 343 // Make sure MAC gets ready.
350 index = 0; 344 index = 0;
@@ -454,7 +448,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
454 448
455 //Init Ba Capability parameters. 449 //Init Ba Capability parameters.
456// RT28XX_BA_INIT(pAd); 450// RT28XX_BA_INIT(pAd);
457#ifdef DOT11_N_SUPPORT
458 pAd->CommonCfg.DesiredHtPhy.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity; 451 pAd->CommonCfg.DesiredHtPhy.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity;
459 pAd->CommonCfg.DesiredHtPhy.AmsduEnable = (USHORT)pAd->CommonCfg.BACapability.field.AmsduEnable; 452 pAd->CommonCfg.DesiredHtPhy.AmsduEnable = (USHORT)pAd->CommonCfg.BACapability.field.AmsduEnable;
460 pAd->CommonCfg.DesiredHtPhy.AmsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize; 453 pAd->CommonCfg.DesiredHtPhy.AmsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize;
@@ -463,7 +456,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
463 pAd->CommonCfg.HtCapability.HtCapInfo.MimoPs = (USHORT)pAd->CommonCfg.BACapability.field.MMPSmode; 456 pAd->CommonCfg.HtCapability.HtCapInfo.MimoPs = (USHORT)pAd->CommonCfg.BACapability.field.MMPSmode;
464 pAd->CommonCfg.HtCapability.HtCapInfo.AMsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize; 457 pAd->CommonCfg.HtCapability.HtCapInfo.AMsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize;
465 pAd->CommonCfg.HtCapability.HtCapParm.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity; 458 pAd->CommonCfg.HtCapability.HtCapParm.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity;
466#endif // DOT11_N_SUPPORT //
467 459
468 // after reading Registry, we now know if in AP mode or STA mode 460 // after reading Registry, we now know if in AP mode or STA mode
469 461
@@ -485,9 +477,7 @@ static int rt28xx_init(IN struct net_device *net_dev)
485 TmpPhy = pAd->CommonCfg.PhyMode; 477 TmpPhy = pAd->CommonCfg.PhyMode;
486 pAd->CommonCfg.PhyMode = 0xff; 478 pAd->CommonCfg.PhyMode = 0xff;
487 RTMPSetPhyMode(pAd, TmpPhy); 479 RTMPSetPhyMode(pAd, TmpPhy);
488#ifdef DOT11_N_SUPPORT
489 SetCommonHT(pAd); 480 SetCommonHT(pAd);
490#endif // DOT11_N_SUPPORT //
491 481
492 // No valid channels. 482 // No valid channels.
493 if (pAd->ChannelListNum == 0) 483 if (pAd->ChannelListNum == 0)
@@ -496,11 +486,9 @@ static int rt28xx_init(IN struct net_device *net_dev)
496 goto err4; 486 goto err4;
497 } 487 }
498 488
499#ifdef DOT11_N_SUPPORT
500 printk("MCS Set = %02x %02x %02x %02x %02x\n", pAd->CommonCfg.HtCapability.MCSSet[0], 489 printk("MCS Set = %02x %02x %02x %02x %02x\n", pAd->CommonCfg.HtCapability.MCSSet[0],
501 pAd->CommonCfg.HtCapability.MCSSet[1], pAd->CommonCfg.HtCapability.MCSSet[2], 490 pAd->CommonCfg.HtCapability.MCSSet[1], pAd->CommonCfg.HtCapability.MCSSet[2],
502 pAd->CommonCfg.HtCapability.MCSSet[3], pAd->CommonCfg.HtCapability.MCSSet[4]); 491 pAd->CommonCfg.HtCapability.MCSSet[3], pAd->CommonCfg.HtCapability.MCSSet[4]);
503#endif // DOT11_N_SUPPORT //
504 492
505#ifdef RT2870 493#ifdef RT2870
506 //Init RT30xx RFRegisters after read RFIC type from EEPROM 494 //Init RT30xx RFRegisters after read RFIC type from EEPROM
@@ -580,10 +568,7 @@ err2:
580 RTMPFreeTxRxRingMemory(pAd); 568 RTMPFreeTxRxRingMemory(pAd);
581// RTMPFreeAdapter(pAd); 569// RTMPFreeAdapter(pAd);
582err1: 570err1:
583
584#ifdef DOT11_N_SUPPORT
585 os_free_mem(pAd, pAd->mpdu_blk_pool.mem); // free BA pool 571 os_free_mem(pAd, pAd->mpdu_blk_pool.mem); // free BA pool
586#endif // DOT11_N_SUPPORT //
587 RT28XX_IRQ_RELEASE(net_dev); 572 RT28XX_IRQ_RELEASE(net_dev);
588 573
589 // shall not set ml_priv to NULL here because the ml_priv didn't been free yet. 574 // shall not set ml_priv to NULL here because the ml_priv didn't been free yet.
diff --git a/drivers/staging/rt2870/rt_profile.c b/drivers/staging/rt2870/rt_profile.c
index 99e2364c96d..58aa37aaf45 100644
--- a/drivers/staging/rt2870/rt_profile.c
+++ b/drivers/staging/rt2870/rt_profile.c
@@ -27,12 +27,10 @@
27 27
28#include "rt_config.h" 28#include "rt_config.h"
29 29
30#ifdef DOT11_N_SUPPORT
31static void HTParametersHook( 30static void HTParametersHook(
32 IN PRTMP_ADAPTER pAd, 31 IN PRTMP_ADAPTER pAd,
33 IN CHAR *pValueStr, 32 IN CHAR *pValueStr,
34 IN CHAR *pInput); 33 IN CHAR *pInput);
35#endif // DOT11_N_SUPPORT //
36 34
37#define ETH_MAC_ADDR_STR_LEN 17 // in format of xx:xx:xx:xx:xx:xx 35#define ETH_MAC_ADDR_STR_LEN 17 // in format of xx:xx:xx:xx:xx:xx
38 36
@@ -1009,9 +1007,7 @@ NDIS_STATUS RTMPReadParametersHook(
1009 { 1007 {
1010 int value = 0, maxPhyMode = PHY_11G; 1008 int value = 0, maxPhyMode = PHY_11G;
1011 1009
1012#ifdef DOT11_N_SUPPORT
1013 maxPhyMode = PHY_11N_5G; 1010 maxPhyMode = PHY_11N_5G;
1014#endif // DOT11_N_SUPPORT //
1015 1011
1016 value = simple_strtol(tmpbuf, 0, 10); 1012 value = simple_strtol(tmpbuf, 0, 10);
1017 1013
@@ -1399,9 +1395,7 @@ NDIS_STATUS RTMPReadParametersHook(
1399 DBGPRINT(RT_DEBUG_TRACE, "HSCounter=%d\n", pAd->CommonCfg.bEnableHSCounter); 1395 DBGPRINT(RT_DEBUG_TRACE, "HSCounter=%d\n", pAd->CommonCfg.bEnableHSCounter);
1400 }*/ 1396 }*/
1401 1397
1402#ifdef DOT11_N_SUPPORT
1403 HTParametersHook(pAd, tmpbuf, buffer); 1398 HTParametersHook(pAd, tmpbuf, buffer);
1404#endif // DOT11_N_SUPPORT //
1405 1399
1406 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1400 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1407 { 1401 {
@@ -1517,7 +1511,6 @@ NDIS_STATUS RTMPReadParametersHook(
1517 return (NDIS_STATUS_SUCCESS); 1511 return (NDIS_STATUS_SUCCESS);
1518} 1512}
1519 1513
1520#ifdef DOT11_N_SUPPORT
1521static void HTParametersHook( 1514static void HTParametersHook(
1522 IN PRTMP_ADAPTER pAd, 1515 IN PRTMP_ADAPTER pAd,
1523 IN CHAR *pValueStr, 1516 IN CHAR *pValueStr,
@@ -1925,5 +1918,3 @@ static void HTParametersHook(
1925 } 1918 }
1926 1919
1927} 1920}
1928#endif // DOT11_N_SUPPORT //
1929
diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index 7bb226f0e79..a51aa8b3659 100644
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -234,11 +234,9 @@ extern UCHAR SsidIe;
234extern UCHAR SupRateIe; 234extern UCHAR SupRateIe;
235extern UCHAR ExtRateIe; 235extern UCHAR ExtRateIe;
236 236
237#ifdef DOT11_N_SUPPORT
238extern UCHAR HtCapIe; 237extern UCHAR HtCapIe;
239extern UCHAR AddHtInfoIe; 238extern UCHAR AddHtInfoIe;
240extern UCHAR NewExtChanIe; 239extern UCHAR NewExtChanIe;
241#endif // DOT11_N_SUPPORT //
242 240
243extern UCHAR ErpIe; 241extern UCHAR ErpIe;
244extern UCHAR DsIe; 242extern UCHAR DsIe;
@@ -263,7 +261,6 @@ extern UCHAR RateSwitchTable11B[];
263extern UCHAR RateSwitchTable11G[]; 261extern UCHAR RateSwitchTable11G[];
264extern UCHAR RateSwitchTable11BG[]; 262extern UCHAR RateSwitchTable11BG[];
265 263
266#ifdef DOT11_N_SUPPORT
267extern UCHAR RateSwitchTable11BGN1S[]; 264extern UCHAR RateSwitchTable11BGN1S[];
268extern UCHAR RateSwitchTable11BGN2S[]; 265extern UCHAR RateSwitchTable11BGN2S[];
269extern UCHAR RateSwitchTable11BGN2SForABand[]; 266extern UCHAR RateSwitchTable11BGN2SForABand[];
@@ -272,11 +269,9 @@ extern UCHAR RateSwitchTable11N2S[];
272extern UCHAR RateSwitchTable11N2SForABand[]; 269extern UCHAR RateSwitchTable11N2SForABand[];
273 270
274extern UCHAR PRE_N_HT_OUI[]; 271extern UCHAR PRE_N_HT_OUI[];
275#endif // DOT11_N_SUPPORT //
276 272
277#define MAXSEQ (0xFFF) 273#define MAXSEQ (0xFFF)
278 274
279#ifdef DOT11_N_SUPPORT
280struct reordering_mpdu 275struct reordering_mpdu
281{ 276{
282 struct reordering_mpdu *next; 277 struct reordering_mpdu *next;
@@ -297,7 +292,6 @@ struct reordering_mpdu_pool
297 NDIS_SPIN_LOCK lock; 292 NDIS_SPIN_LOCK lock;
298 struct reordering_list freelist; 293 struct reordering_list freelist;
299}; 294};
300#endif // DOT11_N_SUPPORT //
301 295
302typedef struct _RSSI_SAMPLE { 296typedef struct _RSSI_SAMPLE {
303 CHAR LastRssi0; // last received RSSI 297 CHAR LastRssi0; // last received RSSI
@@ -438,7 +432,6 @@ typedef struct _QUEUE_HEADER {
438 } \ 432 } \
439} 433}
440 434
441#ifdef DOT11_N_SUPPORT
442// StaActive.SupportedHtPhy.MCSSet is copied from AP beacon. Don't need to update here. 435// StaActive.SupportedHtPhy.MCSSet is copied from AP beacon. Don't need to update here.
443#define COPY_HTSETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(_pAd) \ 436#define COPY_HTSETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(_pAd) \
444{ \ 437{ \
@@ -462,7 +455,6 @@ typedef struct _QUEUE_HEADER {
462 _pAd->MacTab.Content[BSSID_WCID].MmpsMode= (UCHAR)(_pHtCapability->HtCapInfo.MimoPs); \ 455 _pAd->MacTab.Content[BSSID_WCID].MmpsMode= (UCHAR)(_pHtCapability->HtCapInfo.MimoPs); \
463 _pAd->MacTab.Content[BSSID_WCID].MaxRAmpduFactor = (UCHAR)(_pHtCapability->HtCapParm.MaxRAmpduFactor); \ 456 _pAd->MacTab.Content[BSSID_WCID].MaxRAmpduFactor = (UCHAR)(_pHtCapability->HtCapParm.MaxRAmpduFactor); \
464} 457}
465#endif // DOT11_N_SUPPORT //
466 458
467// 459//
468// BBP & RF are using indirect access. Before write any value into it. 460// BBP & RF are using indirect access. Before write any value into it.
@@ -1290,7 +1282,6 @@ typedef enum _ORI_BLOCKACK_STATUS
1290 Originator_Done 1282 Originator_Done
1291} ORI_BLOCKACK_STATUS, *PORI_BLOCKACK_STATUS; 1283} ORI_BLOCKACK_STATUS, *PORI_BLOCKACK_STATUS;
1292 1284
1293#ifdef DOT11_N_SUPPORT
1294typedef struct _BA_ORI_ENTRY{ 1285typedef struct _BA_ORI_ENTRY{
1295 UCHAR Wcid; 1286 UCHAR Wcid;
1296 UCHAR TID; 1287 UCHAR TID;
@@ -1376,7 +1367,6 @@ typedef union _BACAP_STRUC {
1376 } field; 1367 } field;
1377 UINT32 word; 1368 UINT32 word;
1378} BACAP_STRUC, *PBACAP_STRUC; 1369} BACAP_STRUC, *PBACAP_STRUC;
1379#endif // DOT11_N_SUPPORT //
1380 1370
1381//This structure is for all 802.11n card InterOptibilityTest action. Reset all Num every n second. (Details see MLMEPeriodic) 1371//This structure is for all 802.11n card InterOptibilityTest action. Reset all Num every n second. (Details see MLMEPeriodic)
1382typedef struct _IOT_STRUC { 1372typedef struct _IOT_STRUC {
@@ -1666,10 +1656,9 @@ typedef struct _COMMON_CONFIG {
1666 ULONG TxPowerPercentage; // 0~100 % 1656 ULONG TxPowerPercentage; // 0~100 %
1667 ULONG TxPowerDefault; // keep for TxPowerPercentage 1657 ULONG TxPowerDefault; // keep for TxPowerPercentage
1668 1658
1669#ifdef DOT11_N_SUPPORT
1670 BACAP_STRUC BACapability; // NO USE = 0XFF ; IMMED_BA =1 ; DELAY_BA=0 1659 BACAP_STRUC BACapability; // NO USE = 0XFF ; IMMED_BA =1 ; DELAY_BA=0
1671 BACAP_STRUC REGBACapability; // NO USE = 0XFF ; IMMED_BA =1 ; DELAY_BA=0 1660 BACAP_STRUC REGBACapability; // NO USE = 0XFF ; IMMED_BA =1 ; DELAY_BA=0
1672#endif // DOT11_N_SUPPORT // 1661
1673 IOT_STRUC IOTestParm; // 802.11n InterOpbility Test Parameter; 1662 IOT_STRUC IOTestParm; // 802.11n InterOpbility Test Parameter;
1674 ULONG TxPreamble; // Rt802_11PreambleLong, Rt802_11PreambleShort, Rt802_11PreambleAuto 1663 ULONG TxPreamble; // Rt802_11PreambleLong, Rt802_11PreambleShort, Rt802_11PreambleAuto
1675 BOOLEAN bUseZeroToDisableFragment; // Microsoft use 0 as disable 1664 BOOLEAN bUseZeroToDisableFragment; // Microsoft use 0 as disable
@@ -1681,9 +1670,8 @@ typedef struct _COMMON_CONFIG {
1681 BOOLEAN bIEEE80211H; // 1: enable IEEE802.11h spec. 1670 BOOLEAN bIEEE80211H; // 1: enable IEEE802.11h spec.
1682 ULONG DisableOLBCDetect; // 0: enable OLBC detect; 1 disable OLBC detect 1671 ULONG DisableOLBCDetect; // 0: enable OLBC detect; 1 disable OLBC detect
1683 1672
1684#ifdef DOT11_N_SUPPORT
1685 BOOLEAN bRdg; 1673 BOOLEAN bRdg;
1686#endif // DOT11_N_SUPPORT // 1674
1687 BOOLEAN bWmmCapable; // 0:disable WMM, 1:enable WMM 1675 BOOLEAN bWmmCapable; // 0:disable WMM, 1:enable WMM
1688 QOS_CAPABILITY_PARM APQosCapability; // QOS capability of the current associated AP 1676 QOS_CAPABILITY_PARM APQosCapability; // QOS capability of the current associated AP
1689 EDCA_PARM APEdcaParm; // EDCA parameters of the current associated AP 1677 EDCA_PARM APEdcaParm; // EDCA parameters of the current associated AP
@@ -1702,7 +1690,6 @@ typedef struct _COMMON_CONFIG {
1702 // IEEE802.11H--DFS. 1690 // IEEE802.11H--DFS.
1703 RADAR_DETECT_STRUCT RadarDetect; 1691 RADAR_DETECT_STRUCT RadarDetect;
1704 1692
1705#ifdef DOT11_N_SUPPORT
1706 // HT 1693 // HT
1707 UCHAR BASize; // USer desired BAWindowSize. Should not exceed our max capability 1694 UCHAR BASize; // USer desired BAWindowSize. Should not exceed our max capability
1708 //RT_HT_CAPABILITY SupportedHtPhy; 1695 //RT_HT_CAPABILITY SupportedHtPhy;
@@ -1723,7 +1710,6 @@ typedef struct _COMMON_CONFIG {
1723 ULONG LastRcvBSSWidthTriggerEventsTime; 1710 ULONG LastRcvBSSWidthTriggerEventsTime;
1724 1711
1725 UCHAR TxBASize; 1712 UCHAR TxBASize;
1726#endif // DOT11_N_SUPPORT //
1727 1713
1728 // Enable wireless event 1714 // Enable wireless event
1729 BOOLEAN bWirelessEvent; 1715 BOOLEAN bWirelessEvent;
@@ -2069,14 +2055,11 @@ typedef struct _MAC_TABLE_ENTRY {
2069 2055
2070 UINT32 StaConnectTime; // the live time of this station since associated with AP 2056 UINT32 StaConnectTime; // the live time of this station since associated with AP
2071 2057
2072
2073#ifdef DOT11_N_SUPPORT
2074 BOOLEAN bSendBAR; 2058 BOOLEAN bSendBAR;
2075 USHORT NoBADataCountDown; 2059 USHORT NoBADataCountDown;
2076 2060
2077 UINT32 CachedBuf[16]; // UINT (4 bytes) for alignment 2061 UINT32 CachedBuf[16]; // UINT (4 bytes) for alignment
2078 UINT TxBFCount; // 3*3 2062 UINT TxBFCount; // 3*3
2079#endif // DOT11_N_SUPPORT //
2080 UINT FIFOCount; 2063 UINT FIFOCount;
2081 UINT DebugFIFOCount; 2064 UINT DebugFIFOCount;
2082 UINT DebugTxCount; 2065 UINT DebugTxCount;
@@ -2114,10 +2097,8 @@ typedef struct _MAC_TABLE_ENTRY {
2114 // see fOP_STATUS_xxx in RTMP_DEF.C for detail bit definition. fCLIENT_STATUS_AMSDU_INUSED 2097 // see fOP_STATUS_xxx in RTMP_DEF.C for detail bit definition. fCLIENT_STATUS_AMSDU_INUSED
2115 ULONG ClientStatusFlags; 2098 ULONG ClientStatusFlags;
2116 2099
2117 // TODO: Shall we move that to DOT11_N_SUPPORT???
2118 HTTRANSMIT_SETTING HTPhyMode, MaxHTPhyMode, MinHTPhyMode;// For transmit phy setting in TXWI. 2100 HTTRANSMIT_SETTING HTPhyMode, MaxHTPhyMode, MinHTPhyMode;// For transmit phy setting in TXWI.
2119 2101
2120#ifdef DOT11_N_SUPPORT
2121 // HT EWC MIMO-N used parameters 2102 // HT EWC MIMO-N used parameters
2122 USHORT RXBAbitmap; // fill to on-chip RXWI_BA_BITMASK in 8.1.3RX attribute entry format 2103 USHORT RXBAbitmap; // fill to on-chip RXWI_BA_BITMASK in 8.1.3RX attribute entry format
2123 USHORT TXBAbitmap; // This bitmap as originator, only keep in software used to mark AMPDU bit in TXWI 2104 USHORT TXBAbitmap; // This bitmap as originator, only keep in software used to mark AMPDU bit in TXWI
@@ -2134,7 +2115,6 @@ typedef struct _MAC_TABLE_ENTRY {
2134 UCHAR MmpsMode; // MIMO power save more. 2115 UCHAR MmpsMode; // MIMO power save more.
2135 2116
2136 HT_CAPABILITY_IE HTCapability; 2117 HT_CAPABILITY_IE HTCapability;
2137#endif // DOT11_N_SUPPORT //
2138 2118
2139 BOOLEAN bAutoTxRateSwitch; 2119 BOOLEAN bAutoTxRateSwitch;
2140 2120
@@ -2163,16 +2143,13 @@ typedef struct _MAC_TABLE {
2163 BOOLEAN fAnyStationBadAtheros; // Check if any Station is atheros 802.11n Chip. We need to use RTS/CTS with Atheros 802,.11n chip. 2143 BOOLEAN fAnyStationBadAtheros; // Check if any Station is atheros 802.11n Chip. We need to use RTS/CTS with Atheros 802,.11n chip.
2164 BOOLEAN fAnyTxOPForceDisable; // Check if it is necessary to disable BE TxOP 2144 BOOLEAN fAnyTxOPForceDisable; // Check if it is necessary to disable BE TxOP
2165 BOOLEAN fAllStationAsRalink; // Check if all stations are ralink-chipset 2145 BOOLEAN fAllStationAsRalink; // Check if all stations are ralink-chipset
2166#ifdef DOT11_N_SUPPORT
2167 BOOLEAN fAnyStationIsLegacy; // Check if I use legacy rate to transmit to my BSS Station/ 2146 BOOLEAN fAnyStationIsLegacy; // Check if I use legacy rate to transmit to my BSS Station/
2168 BOOLEAN fAnyStationNonGF; // Check if any Station can't support GF. 2147 BOOLEAN fAnyStationNonGF; // Check if any Station can't support GF.
2169 BOOLEAN fAnyStation20Only; // Check if any Station can't support GF. 2148 BOOLEAN fAnyStation20Only; // Check if any Station can't support GF.
2170 BOOLEAN fAnyStationMIMOPSDynamic; // Check if any Station is MIMO Dynamic 2149 BOOLEAN fAnyStationMIMOPSDynamic; // Check if any Station is MIMO Dynamic
2171 BOOLEAN fAnyBASession; // Check if there is BA session. Force turn on RTS/CTS 2150 BOOLEAN fAnyBASession; // Check if there is BA session. Force turn on RTS/CTS
2172#endif // DOT11_N_SUPPORT //
2173} MAC_TABLE, *PMAC_TABLE; 2151} MAC_TABLE, *PMAC_TABLE;
2174 2152
2175#ifdef DOT11_N_SUPPORT
2176#define IS_HT_STA(_pMacEntry) \ 2153#define IS_HT_STA(_pMacEntry) \
2177 (_pMacEntry->MaxHTPhyMode.field.MODE >= MODE_HTMIX) 2154 (_pMacEntry->MaxHTPhyMode.field.MODE >= MODE_HTMIX)
2178 2155
@@ -2181,7 +2158,6 @@ typedef struct _MAC_TABLE {
2181 2158
2182#define PEER_IS_HT_RATE(_pMacEntry) \ 2159#define PEER_IS_HT_RATE(_pMacEntry) \
2183 (_pMacEntry->HTPhyMode.field.MODE >= MODE_HTMIX) 2160 (_pMacEntry->HTPhyMode.field.MODE >= MODE_HTMIX)
2184#endif // DOT11_N_SUPPORT //
2185 2161
2186typedef struct _WDS_ENTRY { 2162typedef struct _WDS_ENTRY {
2187 BOOLEAN Valid; 2163 BOOLEAN Valid;
@@ -2628,9 +2604,8 @@ typedef struct _RTMP_ADAPTER
2628 MAC_TABLE MacTab; // ASIC on-chip WCID entry table. At TX, ASIC always use key according to this on-chip table. 2604 MAC_TABLE MacTab; // ASIC on-chip WCID entry table. At TX, ASIC always use key according to this on-chip table.
2629 NDIS_SPIN_LOCK MacTabLock; 2605 NDIS_SPIN_LOCK MacTabLock;
2630 2606
2631#ifdef DOT11_N_SUPPORT
2632 BA_TABLE BATable; 2607 BA_TABLE BATable;
2633#endif // DOT11_N_SUPPORT // 2608
2634 NDIS_SPIN_LOCK BATabLock; 2609 NDIS_SPIN_LOCK BATabLock;
2635 RALINK_TIMER_STRUCT RECBATimer; 2610 RALINK_TIMER_STRUCT RECBATimer;
2636 2611
@@ -2729,9 +2704,7 @@ typedef struct _RTMP_ADAPTER
2729 2704
2730 struct wificonf WIFItestbed; 2705 struct wificonf WIFItestbed;
2731 2706
2732#ifdef DOT11_N_SUPPORT
2733 struct reordering_mpdu_pool mpdu_blk_pool; 2707 struct reordering_mpdu_pool mpdu_blk_pool;
2734#endif // DOT11_N_SUPPORT //
2735 2708
2736 ULONG OneSecondnonBEpackets; // record non BE packets per second 2709 ULONG OneSecondnonBEpackets; // record non BE packets per second
2737 2710
@@ -3173,7 +3146,6 @@ VOID MlmeQOSAction(
3173 IN PRTMP_ADAPTER pAd, 3146 IN PRTMP_ADAPTER pAd,
3174 IN MLME_QUEUE_ELEM *Elem); 3147 IN MLME_QUEUE_ELEM *Elem);
3175 3148
3176#ifdef DOT11_N_SUPPORT
3177VOID PeerAddBAReqAction( 3149VOID PeerAddBAReqAction(
3178 IN PRTMP_ADAPTER pAd, 3150 IN PRTMP_ADAPTER pAd,
3179 IN MLME_QUEUE_ELEM *Elem); 3151 IN MLME_QUEUE_ELEM *Elem);
@@ -3189,7 +3161,6 @@ VOID PeerDelBAAction(
3189VOID PeerBAAction( 3161VOID PeerBAAction(
3190 IN PRTMP_ADAPTER pAd, 3162 IN PRTMP_ADAPTER pAd,
3191 IN MLME_QUEUE_ELEM *Elem); 3163 IN MLME_QUEUE_ELEM *Elem);
3192#endif // DOT11_N_SUPPORT //
3193 3164
3194VOID SendPSMPAction( 3165VOID SendPSMPAction(
3195 IN PRTMP_ADAPTER pAd, 3166 IN PRTMP_ADAPTER pAd,
@@ -3212,17 +3183,14 @@ VOID PeerBSSTranAction(
3212 IN PRTMP_ADAPTER pAd, 3183 IN PRTMP_ADAPTER pAd,
3213 IN MLME_QUEUE_ELEM *Elem); 3184 IN MLME_QUEUE_ELEM *Elem);
3214 3185
3215#ifdef DOT11_N_SUPPORT
3216VOID PeerHTAction( 3186VOID PeerHTAction(
3217 IN PRTMP_ADAPTER pAd, 3187 IN PRTMP_ADAPTER pAd,
3218 IN MLME_QUEUE_ELEM *Elem); 3188 IN MLME_QUEUE_ELEM *Elem);
3219#endif // DOT11_N_SUPPORT //
3220 3189
3221VOID PeerQOSAction( 3190VOID PeerQOSAction(
3222 IN PRTMP_ADAPTER pAd, 3191 IN PRTMP_ADAPTER pAd,
3223 IN MLME_QUEUE_ELEM *Elem); 3192 IN MLME_QUEUE_ELEM *Elem);
3224 3193
3225#ifdef DOT11_N_SUPPORT
3226VOID RECBATimerTimeout( 3194VOID RECBATimerTimeout(
3227 IN PVOID SystemSpecific1, 3195 IN PVOID SystemSpecific1,
3228 IN PVOID FunctionContext, 3196 IN PVOID FunctionContext,
@@ -3235,7 +3203,6 @@ VOID ORIBATimerTimeout(
3235VOID SendRefreshBAR( 3203VOID SendRefreshBAR(
3236 IN PRTMP_ADAPTER pAd, 3204 IN PRTMP_ADAPTER pAd,
3237 IN MAC_TABLE_ENTRY *pEntry); 3205 IN MAC_TABLE_ENTRY *pEntry);
3238#endif // DOT11_N_SUPPORT //
3239 3206
3240VOID ActHeaderInit( 3207VOID ActHeaderInit(
3241 IN PRTMP_ADAPTER pAd, 3208 IN PRTMP_ADAPTER pAd,
@@ -3268,7 +3235,6 @@ BOOLEAN QosBADataParse(
3268 IN USHORT Datasize, 3235 IN USHORT Datasize,
3269 IN UINT CurRxIndex); 3236 IN UINT CurRxIndex);
3270 3237
3271#ifdef DOT11_N_SUPPORT
3272BOOLEAN CntlEnqueueForRecv( 3238BOOLEAN CntlEnqueueForRecv(
3273 IN PRTMP_ADAPTER pAd, 3239 IN PRTMP_ADAPTER pAd,
3274 IN ULONG Wcid, 3240 IN ULONG Wcid,
@@ -3277,7 +3243,6 @@ BOOLEAN CntlEnqueueForRecv(
3277 3243
3278VOID BaAutoManSwitch( 3244VOID BaAutoManSwitch(
3279 IN PRTMP_ADAPTER pAd); 3245 IN PRTMP_ADAPTER pAd);
3280#endif // DOT11_N_SUPPORT //
3281 3246
3282VOID HTIOTCheck( 3247VOID HTIOTCheck(
3283 IN PRTMP_ADAPTER pAd, 3248 IN PRTMP_ADAPTER pAd,
@@ -3770,11 +3735,9 @@ VOID MlmeRadioOn(
3770VOID BssTableInit( 3735VOID BssTableInit(
3771 IN BSS_TABLE *Tab); 3736 IN BSS_TABLE *Tab);
3772 3737
3773#ifdef DOT11_N_SUPPORT
3774VOID BATableInit( 3738VOID BATableInit(
3775 IN PRTMP_ADAPTER pAd, 3739 IN PRTMP_ADAPTER pAd,
3776 IN BA_TABLE *Tab); 3740 IN BA_TABLE *Tab);
3777#endif // DOT11_N_SUPPORT //
3778 3741
3779ULONG BssTableSearch( 3742ULONG BssTableSearch(
3780 IN BSS_TABLE *Tab, 3743 IN BSS_TABLE *Tab,
@@ -3800,7 +3763,6 @@ VOID BssTableDeleteEntry(
3800 IN PUCHAR pBssid, 3763 IN PUCHAR pBssid,
3801 IN UCHAR Channel); 3764 IN UCHAR Channel);
3802 3765
3803#ifdef DOT11_N_SUPPORT
3804VOID BATableDeleteORIEntry( 3766VOID BATableDeleteORIEntry(
3805 IN OUT PRTMP_ADAPTER pAd, 3767 IN OUT PRTMP_ADAPTER pAd,
3806 IN BA_ORI_ENTRY *pBAORIEntry); 3768 IN BA_ORI_ENTRY *pBAORIEntry);
@@ -3821,7 +3783,6 @@ VOID BATableTearRECEntry(
3821 IN UCHAR TID, 3783 IN UCHAR TID,
3822 IN UCHAR WCID, 3784 IN UCHAR WCID,
3823 IN BOOLEAN ALL); 3785 IN BOOLEAN ALL);
3824#endif // DOT11_N_SUPPORT //
3825 3786
3826VOID BssEntrySet( 3787VOID BssEntrySet(
3827 IN PRTMP_ADAPTER pAd, 3788 IN PRTMP_ADAPTER pAd,
@@ -3883,7 +3844,6 @@ ULONG BssTableSetEntry(
3883 IN USHORT LengthVIE, 3844 IN USHORT LengthVIE,
3884 IN PNDIS_802_11_VARIABLE_IEs pVIE); 3845 IN PNDIS_802_11_VARIABLE_IEs pVIE);
3885 3846
3886#ifdef DOT11_N_SUPPORT
3887VOID BATableInsertEntry( 3847VOID BATableInsertEntry(
3888 IN PRTMP_ADAPTER pAd, 3848 IN PRTMP_ADAPTER pAd,
3889 IN USHORT Aid, 3849 IN USHORT Aid,
@@ -3893,7 +3853,6 @@ VOID BATableInsertEntry(
3893 IN UCHAR BAWinSize, 3853 IN UCHAR BAWinSize,
3894 IN UCHAR OriginatorStatus, 3854 IN UCHAR OriginatorStatus,
3895 IN BOOLEAN IsRecipient); 3855 IN BOOLEAN IsRecipient);
3896#endif // DOT11_N_SUPPORT //
3897 3856
3898VOID BssTableSsidSort( 3857VOID BssTableSsidSort(
3899 IN PRTMP_ADAPTER pAd, 3858 IN PRTMP_ADAPTER pAd,
@@ -4632,11 +4591,9 @@ VOID MlmeUpdateTxRates(
4632 IN BOOLEAN bLinkUp, 4591 IN BOOLEAN bLinkUp,
4633 IN UCHAR apidx); 4592 IN UCHAR apidx);
4634 4593
4635#ifdef DOT11_N_SUPPORT
4636VOID MlmeUpdateHtTxRates( 4594VOID MlmeUpdateHtTxRates(
4637 IN PRTMP_ADAPTER pAd, 4595 IN PRTMP_ADAPTER pAd,
4638 IN UCHAR apidx); 4596 IN UCHAR apidx);
4639#endif // DOT11_N_SUPPORT //
4640 4597
4641VOID RTMPCheckRates( 4598VOID RTMPCheckRates(
4642 IN PRTMP_ADAPTER pAd, 4599 IN PRTMP_ADAPTER pAd,
@@ -4899,7 +4856,6 @@ VOID RTMPAddBSSIDCipher(
4899 IN PNDIS_802_11_KEY pKey, 4856 IN PNDIS_802_11_KEY pKey,
4900 IN UCHAR CipherAlg); 4857 IN UCHAR CipherAlg);
4901 4858
4902#ifdef DOT11_N_SUPPORT
4903VOID RTMPSetHT( 4859VOID RTMPSetHT(
4904 IN PRTMP_ADAPTER pAd, 4860 IN PRTMP_ADAPTER pAd,
4905 IN OID_SET_HT_PHYMODE *pHTPhyMode); 4861 IN OID_SET_HT_PHYMODE *pHTPhyMode);
@@ -4907,7 +4863,6 @@ VOID RTMPSetHT(
4907VOID RTMPSetIndividualHT( 4863VOID RTMPSetIndividualHT(
4908 IN PRTMP_ADAPTER pAd, 4864 IN PRTMP_ADAPTER pAd,
4909 IN UCHAR apidx); 4865 IN UCHAR apidx);
4910#endif // DOT11_N_SUPPORT //
4911 4866
4912VOID RTMPSendWirelessEvent( 4867VOID RTMPSendWirelessEvent(
4913 IN PRTMP_ADAPTER pAd, 4868 IN PRTMP_ADAPTER pAd,
@@ -5568,7 +5523,6 @@ UCHAR VLAN_8023_Header_Copy(
5568 OUT PUCHAR pData, 5523 OUT PUCHAR pData,
5569 IN UCHAR FromWhichBSSID); 5524 IN UCHAR FromWhichBSSID);
5570 5525
5571#ifdef DOT11_N_SUPPORT
5572void ba_flush_reordering_timeout_mpdus( 5526void ba_flush_reordering_timeout_mpdus(
5573 IN PRTMP_ADAPTER pAd, 5527 IN PRTMP_ADAPTER pAd,
5574 IN PBA_REC_ENTRY pBAEntry, 5528 IN PBA_REC_ENTRY pBAEntry,
@@ -5586,7 +5540,6 @@ VOID BAOriSessionSetUp(
5586VOID BASessionTearDownALL( 5540VOID BASessionTearDownALL(
5587 IN OUT PRTMP_ADAPTER pAd, 5541 IN OUT PRTMP_ADAPTER pAd,
5588 IN UCHAR Wcid); 5542 IN UCHAR Wcid);
5589#endif // DOT11_N_SUPPORT //
5590 5543
5591BOOLEAN OS_Need_Clone_Packet(void); 5544BOOLEAN OS_Need_Clone_Packet(void);
5592 5545
@@ -5734,7 +5687,6 @@ INT Set_ResetStatCounter_Proc(
5734 IN PRTMP_ADAPTER pAd, 5687 IN PRTMP_ADAPTER pAd,
5735 IN PUCHAR arg); 5688 IN PUCHAR arg);
5736 5689
5737#ifdef DOT11_N_SUPPORT
5738INT Set_BASetup_Proc( 5690INT Set_BASetup_Proc(
5739 IN PRTMP_ADAPTER pAd, 5691 IN PRTMP_ADAPTER pAd,
5740 IN PUCHAR arg); 5692 IN PUCHAR arg);
@@ -5835,19 +5787,16 @@ INT Set_HtMIMOPSmode_Proc(
5835INT Set_HtTxBASize_Proc( 5787INT Set_HtTxBASize_Proc(
5836 IN PRTMP_ADAPTER pAd, 5788 IN PRTMP_ADAPTER pAd,
5837 IN PUCHAR arg); 5789 IN PUCHAR arg);
5838#endif // DOT11_N_SUPPORT //
5839 5790
5840//Dls , kathy 5791//Dls , kathy
5841VOID RTMPSendDLSTearDownFrame( 5792VOID RTMPSendDLSTearDownFrame(
5842 IN PRTMP_ADAPTER pAd, 5793 IN PRTMP_ADAPTER pAd,
5843 IN PUCHAR pDA); 5794 IN PUCHAR pDA);
5844 5795
5845#ifdef DOT11_N_SUPPORT
5846//Block ACK 5796//Block ACK
5847VOID QueryBATABLE( 5797VOID QueryBATABLE(
5848 IN PRTMP_ADAPTER pAd, 5798 IN PRTMP_ADAPTER pAd,
5849 OUT PQUERYBA_TABLE pBAT); 5799 OUT PQUERYBA_TABLE pBAT);
5850#endif // DOT11_N_SUPPORT //
5851 5800
5852INT WpaCheckEapCode( 5801INT WpaCheckEapCode(
5853 IN PRTMP_ADAPTER pAd, 5802 IN PRTMP_ADAPTER pAd,
@@ -5865,15 +5814,12 @@ VOID SendAssocIEsToWpaSupplicant(
5865int wext_notify_event_assoc( 5814int wext_notify_event_assoc(
5866 IN RTMP_ADAPTER *pAd); 5815 IN RTMP_ADAPTER *pAd);
5867 5816
5868#ifdef DOT11_N_SUPPORT
5869VOID Handle_BSS_Width_Trigger_Events( 5817VOID Handle_BSS_Width_Trigger_Events(
5870 IN PRTMP_ADAPTER pAd); 5818 IN PRTMP_ADAPTER pAd);
5871 5819
5872void build_ext_channel_switch_ie( 5820void build_ext_channel_switch_ie(
5873 IN PRTMP_ADAPTER pAd, 5821 IN PRTMP_ADAPTER pAd,
5874 IN HT_EXT_CHANNEL_SWITCH_ANNOUNCEMENT_IE *pIE); 5822 IN HT_EXT_CHANNEL_SWITCH_ANNOUNCEMENT_IE *pIE);
5875#endif // DOT11_N_SUPPORT //
5876
5877 5823
5878BOOLEAN APRxDoneInterruptHandle( 5824BOOLEAN APRxDoneInterruptHandle(
5879 IN PRTMP_ADAPTER pAd); 5825 IN PRTMP_ADAPTER pAd);
@@ -5882,7 +5828,6 @@ BOOLEAN STARxDoneInterruptHandle(
5882 IN PRTMP_ADAPTER pAd, 5828 IN PRTMP_ADAPTER pAd,
5883 IN BOOLEAN argc); 5829 IN BOOLEAN argc);
5884 5830
5885#ifdef DOT11_N_SUPPORT
5886// AMPDU packet indication 5831// AMPDU packet indication
5887VOID Indicate_AMPDU_Packet( 5832VOID Indicate_AMPDU_Packet(
5888 IN PRTMP_ADAPTER pAd, 5833 IN PRTMP_ADAPTER pAd,
@@ -5894,7 +5839,6 @@ VOID Indicate_AMSDU_Packet(
5894 IN PRTMP_ADAPTER pAd, 5839 IN PRTMP_ADAPTER pAd,
5895 IN RX_BLK *pRxBlk, 5840 IN RX_BLK *pRxBlk,
5896 IN UCHAR FromWhichBSSID); 5841 IN UCHAR FromWhichBSSID);
5897#endif // DOT11_N_SUPPORT //
5898 5842
5899// Normal legacy Rx packet indication 5843// Normal legacy Rx packet indication
5900VOID Indicate_Legacy_Packet( 5844VOID Indicate_Legacy_Packet(
@@ -6142,13 +6086,11 @@ static inline char* GetPhyMode(
6142 6086
6143 case MODE_OFDM: 6087 case MODE_OFDM:
6144 return "OFDM"; 6088 return "OFDM";
6145#ifdef DOT11_N_SUPPORT
6146 case MODE_HTMIX: 6089 case MODE_HTMIX:
6147 return "HTMIX"; 6090 return "HTMIX";
6148 6091
6149 case MODE_HTGREENFIELD: 6092 case MODE_HTGREENFIELD:
6150 return "GREEN"; 6093 return "GREEN";
6151#endif // DOT11_N_SUPPORT //
6152 default: 6094 default:
6153 return "N/A"; 6095 return "N/A";
6154 } 6096 }
@@ -6165,10 +6107,8 @@ static inline char* GetBW(
6165 6107
6166 case BW_20: 6108 case BW_20:
6167 return "20M"; 6109 return "20M";
6168#ifdef DOT11_N_SUPPORT
6169 case BW_40: 6110 case BW_40:
6170 return "40M"; 6111 return "40M";
6171#endif // DOT11_N_SUPPORT //
6172 default: 6112 default:
6173 return "N/A"; 6113 return "N/A";
6174 } 6114 }
diff --git a/drivers/staging/rt2870/rtmp_def.h b/drivers/staging/rt2870/rtmp_def.h
index e09a96ca59e..75aa4c6e3a4 100644
--- a/drivers/staging/rt2870/rtmp_def.h
+++ b/drivers/staging/rt2870/rtmp_def.h
@@ -1010,10 +1010,9 @@
1010// Preamble MODE in TxD 1010// Preamble MODE in TxD
1011#define MODE_CCK 0 1011#define MODE_CCK 0
1012#define MODE_OFDM 1 1012#define MODE_OFDM 1
1013#ifdef DOT11_N_SUPPORT
1014#define MODE_HTMIX 2 1013#define MODE_HTMIX 2
1015#define MODE_HTGREENFIELD 3 1014#define MODE_HTGREENFIELD 3
1016#endif // DOT11_N_SUPPORT // 1015
1017// MCS for CCK. BW.SGI.STBC are reserved 1016// MCS for CCK. BW.SGI.STBC are reserved
1018#define MCS_LONGP_RATE_1 0 // long preamble CCK 1Mbps 1017#define MCS_LONGP_RATE_1 0 // long preamble CCK 1Mbps
1019#define MCS_LONGP_RATE_2 1 // long preamble CCK 1Mbps 1018#define MCS_LONGP_RATE_2 1 // long preamble CCK 1Mbps
@@ -1060,12 +1059,10 @@
1060#define MCS_32 32 1059#define MCS_32 32
1061#define MCS_AUTO 33 1060#define MCS_AUTO 33
1062 1061
1063#ifdef DOT11_N_SUPPORT
1064// OID_HTPHYMODE 1062// OID_HTPHYMODE
1065// MODE 1063// MODE
1066#define HTMODE_MM 0 1064#define HTMODE_MM 0
1067#define HTMODE_GF 1 1065#define HTMODE_GF 1
1068#endif // DOT11_N_SUPPORT //
1069 1066
1070// Fixed Tx MODE - HT, CCK or OFDM 1067// Fixed Tx MODE - HT, CCK or OFDM
1071#define FIXED_TXMODE_HT 0 1068#define FIXED_TXMODE_HT 0
@@ -1077,15 +1074,12 @@
1077#define BW_BOTH BAND_WIDTH_BOTH 1074#define BW_BOTH BAND_WIDTH_BOTH
1078#define BW_10 BAND_WIDTH_10 // 802.11j has 10MHz. This definition is for internal usage. doesn't fill in the IE or other field. 1075#define BW_10 BAND_WIDTH_10 // 802.11j has 10MHz. This definition is for internal usage. doesn't fill in the IE or other field.
1079 1076
1080#ifdef DOT11_N_SUPPORT
1081// SHORTGI 1077// SHORTGI
1082#define GI_400 GAP_INTERVAL_400 // only support in HT mode 1078#define GI_400 GAP_INTERVAL_400 // only support in HT mode
1083#define GI_BOTH GAP_INTERVAL_BOTH 1079#define GI_BOTH GAP_INTERVAL_BOTH
1084#endif // DOT11_N_SUPPORT //
1085#define GI_800 GAP_INTERVAL_800 1080#define GI_800 GAP_INTERVAL_800
1086// STBC 1081// STBC
1087#define STBC_NONE 0 1082#define STBC_NONE 0
1088#ifdef DOT11_N_SUPPORT
1089#define STBC_USE 1 // limited use in rt2860b phy 1083#define STBC_USE 1 // limited use in rt2860b phy
1090#define RXSTBC_ONE 1 // rx support of one spatial stream 1084#define RXSTBC_ONE 1 // rx support of one spatial stream
1091#define RXSTBC_TWO 2 // rx support of 1 and 2 spatial stream 1085#define RXSTBC_TWO 2 // rx support of 1 and 2 spatial stream
@@ -1107,8 +1101,6 @@
1107#define AMSDU_0 0 1101#define AMSDU_0 0
1108#define AMSDU_1 1 1102#define AMSDU_1 1
1109 1103
1110#endif // DOT11_N_SUPPORT //
1111
1112// MCS use 7 bits 1104// MCS use 7 bits
1113#define TXRATEMIMO 0x80 1105#define TXRATEMIMO 0x80
1114#define TXRATEMCS 0x7F 1106#define TXRATEMCS 0x7F
diff --git a/drivers/staging/rt2870/sta/assoc.c b/drivers/staging/rt2870/sta/assoc.c
index 3612bf04288..1523f6c513b 100644
--- a/drivers/staging/rt2870/sta/assoc.c
+++ b/drivers/staging/rt2870/sta/assoc.c
@@ -341,7 +341,6 @@ VOID MlmeAssocReqAction(
341 FrameLen += tmp; 341 FrameLen += tmp;
342 } 342 }
343 343
344#ifdef DOT11_N_SUPPORT
345 // HT 344 // HT
346 if ((pAd->MlmeAux.HtCapabilityLen > 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) 345 if ((pAd->MlmeAux.HtCapabilityLen > 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED))
347 { 346 {
@@ -368,7 +367,6 @@ VOID MlmeAssocReqAction(
368 } 367 }
369 FrameLen += TmpLen; 368 FrameLen += TmpLen;
370 } 369 }
371#endif // DOT11_N_SUPPORT //
372 370
373 // add Ralink proprietary IE to inform AP this STA is going to use AGGREGATION or PIGGY-BACK+AGGREGATION 371 // add Ralink proprietary IE to inform AP this STA is going to use AGGREGATION or PIGGY-BACK+AGGREGATION
374 // Case I: (Aggregation + Piggy-Back) 372 // Case I: (Aggregation + Piggy-Back)
@@ -676,7 +674,6 @@ VOID MlmeReassocReqAction(
676 FrameLen += tmp; 674 FrameLen += tmp;
677 } 675 }
678 676
679#ifdef DOT11_N_SUPPORT
680 // HT 677 // HT
681 if ((pAd->MlmeAux.HtCapabilityLen > 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) 678 if ((pAd->MlmeAux.HtCapabilityLen > 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED))
682 { 679 {
@@ -703,7 +700,6 @@ VOID MlmeReassocReqAction(
703 } 700 }
704 FrameLen += TmpLen; 701 FrameLen += TmpLen;
705 } 702 }
706#endif // DOT11_N_SUPPORT //
707 703
708 // add Ralink proprietary IE to inform AP this STA is going to use AGGREGATION or PIGGY-BACK+AGGREGATION 704 // add Ralink proprietary IE to inform AP this STA is going to use AGGREGATION or PIGGY-BACK+AGGREGATION
709 // Case I: (Aggregation + Piggy-Back) 705 // Case I: (Aggregation + Piggy-Back)
@@ -882,9 +878,7 @@ VOID PeerAssocRspAction(
882 if(MAC_ADDR_EQUAL(Addr2, pAd->MlmeAux.Bssid)) 878 if(MAC_ADDR_EQUAL(Addr2, pAd->MlmeAux.Bssid))
883 { 879 {
884 DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspAction():ASSOC - receive ASSOC_RSP to me (status=%d)\n", Status)); 880 DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspAction():ASSOC - receive ASSOC_RSP to me (status=%d)\n", Status));
885#ifdef DOT11_N_SUPPORT
886 DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspAction():MacTable [%d].AMsduSize = %d. ClientStatusFlags = 0x%lx \n",Elem->Wcid, pAd->MacTab.Content[BSSID_WCID].AMsduSize, pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags)); 881 DBGPRINT(RT_DEBUG_TRACE, ("PeerAssocRspAction():MacTable [%d].AMsduSize = %d. ClientStatusFlags = 0x%lx \n",Elem->Wcid, pAd->MacTab.Content[BSSID_WCID].AMsduSize, pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags));
887#endif // DOT11_N_SUPPORT //
888 RTMPCancelTimer(&pAd->MlmeAux.AssocTimer, &TimerCancelled); 882 RTMPCancelTimer(&pAd->MlmeAux.AssocTimer, &TimerCancelled);
889 if(Status == MLME_SUCCESS) 883 if(Status == MLME_SUCCESS)
890 { 884 {
@@ -1035,7 +1029,7 @@ VOID AssocPostProc(
1035 COPY_MAC_ADDR(pAd->MlmeAux.Bssid, pAddr2); 1029 COPY_MAC_ADDR(pAd->MlmeAux.Bssid, pAddr2);
1036 pAd->MlmeAux.Aid = Aid; 1030 pAd->MlmeAux.Aid = Aid;
1037 pAd->MlmeAux.CapabilityInfo = CapabilityInfo & SUPPORTED_CAPABILITY_INFO; 1031 pAd->MlmeAux.CapabilityInfo = CapabilityInfo & SUPPORTED_CAPABILITY_INFO;
1038#ifdef DOT11_N_SUPPORT 1032
1039 // Some HT AP might lost WMM IE. We add WMM ourselves. beacuase HT requires QoS on. 1033 // Some HT AP might lost WMM IE. We add WMM ourselves. beacuase HT requires QoS on.
1040 if ((HtCapabilityLen > 0) && (pEdcaParm->bValid == FALSE)) 1034 if ((HtCapabilityLen > 0) && (pEdcaParm->bValid == FALSE))
1041 { 1035 {
@@ -1061,7 +1055,6 @@ VOID AssocPostProc(
1061 pEdcaParm->Txop[3] = 48; 1055 pEdcaParm->Txop[3] = 48;
1062 1056
1063 } 1057 }
1064#endif // DOT11_N_SUPPORT //
1065 1058
1066 NdisMoveMemory(&pAd->MlmeAux.APEdcaParm, pEdcaParm, sizeof(EDCA_PARM)); 1059 NdisMoveMemory(&pAd->MlmeAux.APEdcaParm, pEdcaParm, sizeof(EDCA_PARM));
1067 1060
@@ -1075,7 +1068,6 @@ VOID AssocPostProc(
1075 NdisMoveMemory(pAd->MlmeAux.ExtRate, ExtRate, ExtRateLen); 1068 NdisMoveMemory(pAd->MlmeAux.ExtRate, ExtRate, ExtRateLen);
1076 RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen); 1069 RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen);
1077 1070
1078#ifdef DOT11_N_SUPPORT
1079 if (HtCapabilityLen > 0) 1071 if (HtCapabilityLen > 0)
1080 { 1072 {
1081 RTMPCheckHt(pAd, BSSID_WCID, pHtCapability, pAddHtInfo); 1073 RTMPCheckHt(pAd, BSSID_WCID, pHtCapability, pAddHtInfo);
@@ -1084,7 +1076,6 @@ VOID AssocPostProc(
1084 1076
1085 DBGPRINT(RT_DEBUG_TRACE, ("AssocPostProc===> (Mmps=%d, AmsduSize=%d, )\n", 1077 DBGPRINT(RT_DEBUG_TRACE, ("AssocPostProc===> (Mmps=%d, AmsduSize=%d, )\n",
1086 pAd->MacTab.Content[BSSID_WCID].MmpsMode, pAd->MacTab.Content[BSSID_WCID].AMsduSize)); 1078 pAd->MacTab.Content[BSSID_WCID].MmpsMode, pAd->MacTab.Content[BSSID_WCID].AMsduSize));
1087#endif // DOT11_N_SUPPORT //
1088 1079
1089 // Set New WPA information 1080 // Set New WPA information
1090 Idx = BssTableSearch(&pAd->ScanTab, pAddr2, pAd->MlmeAux.Channel); 1081 Idx = BssTableSearch(&pAd->ScanTab, pAddr2, pAd->MlmeAux.Channel);
@@ -1535,11 +1526,9 @@ BOOLEAN StaAddMacTableEntry(
1535 if ((pAd->CommonCfg.PhyMode == PHY_11G) && (MaxSupportedRate < RATE_FIRST_OFDM_RATE)) 1526 if ((pAd->CommonCfg.PhyMode == PHY_11G) && (MaxSupportedRate < RATE_FIRST_OFDM_RATE))
1536 return FALSE; 1527 return FALSE;
1537 1528
1538#ifdef DOT11_N_SUPPORT
1539 // 11n only 1529 // 11n only
1540 if (((pAd->CommonCfg.PhyMode == PHY_11N_2_4G) || (pAd->CommonCfg.PhyMode == PHY_11N_5G))&& (HtCapabilityLen == 0)) 1530 if (((pAd->CommonCfg.PhyMode == PHY_11N_2_4G) || (pAd->CommonCfg.PhyMode == PHY_11N_5G))&& (HtCapabilityLen == 0))
1541 return FALSE; 1531 return FALSE;
1542#endif // DOT11_N_SUPPORT //
1543 1532
1544 if (!pEntry) 1533 if (!pEntry)
1545 return FALSE; 1534 return FALSE;
@@ -1585,7 +1574,6 @@ BOOLEAN StaAddMacTableEntry(
1585 CLIENT_STATUS_CLEAR_FLAG(pEntry, fCLIENT_STATUS_PIGGYBACK_CAPABLE); 1574 CLIENT_STATUS_CLEAR_FLAG(pEntry, fCLIENT_STATUS_PIGGYBACK_CAPABLE);
1586 } 1575 }
1587 1576
1588#ifdef DOT11_N_SUPPORT
1589 // If this Entry supports 802.11n, upgrade to HT rate. 1577 // If this Entry supports 802.11n, upgrade to HT rate.
1590 if ((HtCapabilityLen != 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) 1578 if ((HtCapabilityLen != 0) && (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED))
1591 { 1579 {
@@ -1684,7 +1672,6 @@ BOOLEAN StaAddMacTableEntry(
1684 } 1672 }
1685 1673
1686 NdisMoveMemory(&pEntry->HTCapability, pHtCapability, sizeof(HT_CAPABILITY_IE)); 1674 NdisMoveMemory(&pEntry->HTCapability, pHtCapability, sizeof(HT_CAPABILITY_IE));
1687#endif // DOT11_N_SUPPORT //
1688 1675
1689 pEntry->HTPhyMode.word = pEntry->MaxHTPhyMode.word; 1676 pEntry->HTPhyMode.word = pEntry->MaxHTPhyMode.word;
1690 pEntry->CurrTxRate = pEntry->MaxSupportedRate; 1677 pEntry->CurrTxRate = pEntry->MaxSupportedRate;
diff --git a/drivers/staging/rt2870/sta/connect.c b/drivers/staging/rt2870/sta/connect.c
index b06c5c137de..76f1b98c462 100644
--- a/drivers/staging/rt2870/sta/connect.c
+++ b/drivers/staging/rt2870/sta/connect.c
@@ -816,7 +816,7 @@ VOID CntlWaitStartProc(
816 DBGPRINT(RT_DEBUG_TRACE, ("CNTL - Channel=%d, Start adhoc on W53(52,56,60,64) Channels are not accepted\n", pAd->CommonCfg.Channel)); 816 DBGPRINT(RT_DEBUG_TRACE, ("CNTL - Channel=%d, Start adhoc on W53(52,56,60,64) Channels are not accepted\n", pAd->CommonCfg.Channel));
817 return; 817 return;
818 } 818 }
819#ifdef DOT11_N_SUPPORT 819
820 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) 820 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
821 { 821 {
822 N_ChannelCheck(pAd); 822 N_ChannelCheck(pAd);
@@ -840,7 +840,6 @@ VOID CntlWaitStartProc(
840 } 840 }
841 } 841 }
842 else 842 else
843#endif // DOT11_N_SUPPORT //
844 { 843 {
845 pAd->StaActive.SupportedPhyInfo.bHtEnable = FALSE; 844 pAd->StaActive.SupportedPhyInfo.bHtEnable = FALSE;
846 } 845 }
@@ -1127,9 +1126,8 @@ VOID LinkUp(
1127 1126
1128 COPY_SETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(pAd); 1127 COPY_SETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(pAd);
1129 1128
1130#ifdef DOT11_N_SUPPORT
1131 COPY_HTSETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(pAd); 1129 COPY_HTSETTINGS_FROM_MLME_AUX_TO_ACTIVE_CFG(pAd);
1132#endif // DOT11_N_SUPPORT // 1130
1133 // It's quite difficult to tell if a newly added KEY is WEP or CKIP until a new BSS 1131 // It's quite difficult to tell if a newly added KEY is WEP or CKIP until a new BSS
1134 // is formed (either ASSOC/RE-ASSOC done or IBSS started. LinkUP should be a safe place 1132 // is formed (either ASSOC/RE-ASSOC done or IBSS started. LinkUP should be a safe place
1135 // to examine if cipher algorithm switching is required. 1133 // to examine if cipher algorithm switching is required.
@@ -1142,10 +1140,8 @@ VOID LinkUp(
1142 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_ADHOC_ON); 1140 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_ADHOC_ON);
1143 OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_INFRA_ON); 1141 OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_INFRA_ON);
1144 1142
1145#ifdef DOT11_N_SUPPORT
1146 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) 1143 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
1147 AdhocTurnOnQos(pAd); 1144 AdhocTurnOnQos(pAd);
1148#endif // DOT11_N_SUPPORT //
1149 1145
1150 DBGPRINT(RT_DEBUG_TRACE, ("!!!Adhoc LINK UP !!! \n" )); 1146 DBGPRINT(RT_DEBUG_TRACE, ("!!!Adhoc LINK UP !!! \n" ));
1151 } 1147 }
@@ -1164,7 +1160,6 @@ VOID LinkUp(
1164 Value |= pAd->CommonCfg.RegTransmitSetting.field.TxBF; 1160 Value |= pAd->CommonCfg.RegTransmitSetting.field.TxBF;
1165 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, Value); 1161 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, Value);
1166 1162
1167#ifdef DOT11_N_SUPPORT
1168 // Change to AP channel 1163 // Change to AP channel
1169 if ((pAd->CommonCfg.CentralChannel > pAd->CommonCfg.Channel) && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth == BW_40)) 1164 if ((pAd->CommonCfg.CentralChannel > pAd->CommonCfg.Channel) && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth == BW_40))
1170 { 1165 {
@@ -1228,7 +1223,6 @@ VOID LinkUp(
1228 DBGPRINT(RT_DEBUG_TRACE, ("!!! 40MHz Upper LINK UP !!! Control Channel at UpperCentral = %d \n", pAd->CommonCfg.CentralChannel )); 1223 DBGPRINT(RT_DEBUG_TRACE, ("!!! 40MHz Upper LINK UP !!! Control Channel at UpperCentral = %d \n", pAd->CommonCfg.CentralChannel ));
1229 } 1224 }
1230 else 1225 else
1231#endif // DOT11_N_SUPPORT //
1232 { 1226 {
1233 pAd->CommonCfg.BBPCurrentBW = BW_20; 1227 pAd->CommonCfg.BBPCurrentBW = BW_20;
1234 pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel; 1228 pAd->CommonCfg.CentralChannel = pAd->CommonCfg.Channel;
@@ -1267,9 +1261,7 @@ VOID LinkUp(
1267 DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK UP !!! (BssType=%d, AID=%d, ssid=%s, Channel=%d, CentralChannel = %d)\n", 1261 DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK UP !!! (BssType=%d, AID=%d, ssid=%s, Channel=%d, CentralChannel = %d)\n",
1268 BssType, pAd->StaActive.Aid, pAd->CommonCfg.Ssid, pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel)); 1262 BssType, pAd->StaActive.Aid, pAd->CommonCfg.Ssid, pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel));
1269 1263
1270#ifdef DOT11_N_SUPPORT
1271 DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK UP !!! (Density =%d, )\n", pAd->MacTab.Content[BSSID_WCID].MpduDensity)); 1264 DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK UP !!! (Density =%d, )\n", pAd->MacTab.Content[BSSID_WCID].MpduDensity));
1272#endif // DOT11_N_SUPPORT //
1273 1265
1274 AsicSetBssid(pAd, pAd->CommonCfg.Bssid); 1266 AsicSetBssid(pAd, pAd->CommonCfg.Bssid);
1275 1267
@@ -1279,7 +1271,6 @@ VOID LinkUp(
1279 // Call this for RTS protectionfor legacy rate, we will always enable RTS threshold, but normally it will not hit 1271 // Call this for RTS protectionfor legacy rate, we will always enable RTS threshold, but normally it will not hit
1280 AsicUpdateProtect(pAd, 0, (OFDMSETPROTECT | CCKSETPROTECT), TRUE, FALSE); 1272 AsicUpdateProtect(pAd, 0, (OFDMSETPROTECT | CCKSETPROTECT), TRUE, FALSE);
1281 1273
1282#ifdef DOT11_N_SUPPORT
1283 if ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE)) 1274 if ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE))
1284 { 1275 {
1285 // Update HT protectionfor based on AP's operating mode. 1276 // Update HT protectionfor based on AP's operating mode.
@@ -1290,7 +1281,6 @@ VOID LinkUp(
1290 else 1281 else
1291 AsicUpdateProtect(pAd, pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode, ALLN_SETPROTECT, FALSE, FALSE); 1282 AsicUpdateProtect(pAd, pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode, ALLN_SETPROTECT, FALSE, FALSE);
1292 } 1283 }
1293#endif // DOT11_N_SUPPORT //
1294 1284
1295 NdisZeroMemory(&pAd->DrsCounters, sizeof(COUNTER_DRS)); 1285 NdisZeroMemory(&pAd->DrsCounters, sizeof(COUNTER_DRS));
1296 1286
@@ -1538,10 +1528,8 @@ VOID LinkUp(
1538 pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags)); 1528 pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags));
1539 1529
1540 MlmeUpdateTxRates(pAd, TRUE, BSS0); 1530 MlmeUpdateTxRates(pAd, TRUE, BSS0);
1541#ifdef DOT11_N_SUPPORT
1542 MlmeUpdateHtTxRates(pAd, BSS0); 1531 MlmeUpdateHtTxRates(pAd, BSS0);
1543 DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK UP !! (StaActive.bHtEnable =%d, )\n", pAd->StaActive.SupportedPhyInfo.bHtEnable)); 1532 DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK UP !! (StaActive.bHtEnable =%d, )\n", pAd->StaActive.SupportedPhyInfo.bHtEnable));
1544#endif // DOT11_N_SUPPORT //
1545 1533
1546 if (pAd->CommonCfg.bAggregationCapable) 1534 if (pAd->CommonCfg.bAggregationCapable)
1547 { 1535 {
@@ -1561,12 +1549,11 @@ VOID LinkUp(
1561 1549
1562 if (pAd->MlmeAux.APRalinkIe != 0x0) 1550 if (pAd->MlmeAux.APRalinkIe != 0x0)
1563 { 1551 {
1564#ifdef DOT11_N_SUPPORT
1565 if (CLIENT_STATUS_TEST_FLAG(&pAd->MacTab.Content[BSSID_WCID], fCLIENT_STATUS_RDG_CAPABLE)) 1552 if (CLIENT_STATUS_TEST_FLAG(&pAd->MacTab.Content[BSSID_WCID], fCLIENT_STATUS_RDG_CAPABLE))
1566 { 1553 {
1567 AsicEnableRDG(pAd); 1554 AsicEnableRDG(pAd);
1568 } 1555 }
1569#endif // DOT11_N_SUPPORT // 1556
1570 OPSTATUS_SET_FLAG(pAd, fCLIENT_STATUS_RALINK_CHIPSET); 1557 OPSTATUS_SET_FLAG(pAd, fCLIENT_STATUS_RALINK_CHIPSET);
1571 CLIENT_STATUS_SET_FLAG(&pAd->MacTab.Content[BSSID_WCID], fCLIENT_STATUS_RALINK_CHIPSET); 1558 CLIENT_STATUS_SET_FLAG(&pAd->MacTab.Content[BSSID_WCID], fCLIENT_STATUS_RALINK_CHIPSET);
1572 } 1559 }
@@ -1577,9 +1564,7 @@ VOID LinkUp(
1577 } 1564 }
1578 } 1565 }
1579 1566
1580#ifdef DOT11_N_SUPPORT
1581 DBGPRINT(RT_DEBUG_TRACE, ("NDIS_STATUS_MEDIA_CONNECT Event B!.BACapability = %x. ClientStatusFlags = %lx\n", pAd->CommonCfg.BACapability.word, pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags)); 1567 DBGPRINT(RT_DEBUG_TRACE, ("NDIS_STATUS_MEDIA_CONNECT Event B!.BACapability = %x. ClientStatusFlags = %lx\n", pAd->CommonCfg.BACapability.word, pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags));
1582#endif // DOT11_N_SUPPORT //
1583 1568
1584 // Set LED 1569 // Set LED
1585 RTMPSetLED(pAd, LED_LINK_UP); 1570 RTMPSetLED(pAd, LED_LINK_UP);
@@ -1604,13 +1589,13 @@ VOID LinkUp(
1604 if (pAd->StaCfg.bAutoTxRateSwitch == FALSE) 1589 if (pAd->StaCfg.bAutoTxRateSwitch == FALSE)
1605 { 1590 {
1606 pEntry->bAutoTxRateSwitch = FALSE; 1591 pEntry->bAutoTxRateSwitch = FALSE;
1607#ifdef DOT11_N_SUPPORT 1592
1608 if (pEntry->HTPhyMode.field.MCS == 32) 1593 if (pEntry->HTPhyMode.field.MCS == 32)
1609 pEntry->HTPhyMode.field.ShortGI = GI_800; 1594 pEntry->HTPhyMode.field.ShortGI = GI_800;
1610 1595
1611 if ((pEntry->HTPhyMode.field.MCS > MCS_7) || (pEntry->HTPhyMode.field.MCS == 32)) 1596 if ((pEntry->HTPhyMode.field.MCS > MCS_7) || (pEntry->HTPhyMode.field.MCS == 32))
1612 pEntry->HTPhyMode.field.STBC = STBC_NONE; 1597 pEntry->HTPhyMode.field.STBC = STBC_NONE;
1613#endif // DOT11_N_SUPPORT // 1598
1614 // If the legacy mode is set, overwrite the transmit setting of this entry. 1599 // If the legacy mode is set, overwrite the transmit setting of this entry.
1615 if (pEntry->HTPhyMode.field.MODE <= MODE_OFDM) 1600 if (pEntry->HTPhyMode.field.MODE <= MODE_OFDM)
1616 RTMPUpdateLegacyTxSetting((UCHAR)pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode, pEntry); 1601 RTMPUpdateLegacyTxSetting((UCHAR)pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode, pEntry);
@@ -1639,7 +1624,6 @@ VOID LinkUp(
1639 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R1, Value); 1624 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R1, Value);
1640 } 1625 }
1641 1626
1642#ifdef DOT11_N_SUPPORT
1643 if (pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) 1627 if (pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE)
1644 { 1628 {
1645 } 1629 }
@@ -1649,7 +1633,6 @@ VOID LinkUp(
1649 // Because our Init value is 1 at MACRegTable. 1633 // Because our Init value is 1 at MACRegTable.
1650 RTMP_IO_WRITE32(pAd, MAX_LEN_CFG, 0x0fff); 1634 RTMP_IO_WRITE32(pAd, MAX_LEN_CFG, 0x0fff);
1651 } 1635 }
1652#endif // DOT11_N_SUPPORT //
1653 1636
1654 // Patch for Marvel AP to gain high throughput 1637 // Patch for Marvel AP to gain high throughput
1655 // Need to set as following, 1638 // Need to set as following,
@@ -1661,7 +1644,6 @@ VOID LinkUp(
1661 // Txop can only be modified when RDG is off, WMM is disable and TxBurst is enable 1644 // Txop can only be modified when RDG is off, WMM is disable and TxBurst is enable
1662 // 1645 //
1663 // if 1. Legacy AP WMM on, or 2. 11n AP, AMPDU disable. Force turn off burst no matter what bEnableTxBurst is. 1646 // if 1. Legacy AP WMM on, or 2. 11n AP, AMPDU disable. Force turn off burst no matter what bEnableTxBurst is.
1664#ifdef DOT11_N_SUPPORT
1665 if (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED))) 1647 if (((pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) && (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_WMM_INUSED)))
1666 || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE))) 1648 || ((pAd->StaActive.SupportedPhyInfo.bHtEnable == TRUE) && (pAd->CommonCfg.BACapability.field.Policy == BA_NOTUSE)))
1667 { 1649 {
@@ -1673,7 +1655,6 @@ VOID LinkUp(
1673 DBGPRINT(RT_DEBUG_TRACE, ("Txburst 1\n")); 1655 DBGPRINT(RT_DEBUG_TRACE, ("Txburst 1\n"));
1674 } 1656 }
1675 else 1657 else
1676#endif // DOT11_N_SUPPORT //
1677 if (pAd->CommonCfg.bEnableTxBurst) 1658 if (pAd->CommonCfg.bEnableTxBurst)
1678 { 1659 {
1679 RTMP_IO_READ32(pAd, EDCA_AC0_CFG, &Data); 1660 RTMP_IO_READ32(pAd, EDCA_AC0_CFG, &Data);
@@ -1695,7 +1676,6 @@ VOID LinkUp(
1695 DBGPRINT(RT_DEBUG_TRACE, ("Txburst 3\n")); 1676 DBGPRINT(RT_DEBUG_TRACE, ("Txburst 3\n"));
1696 } 1677 }
1697 1678
1698#ifdef DOT11_N_SUPPORT
1699 // Re-check to turn on TX burst or not. 1679 // Re-check to turn on TX burst or not.
1700 if ((pAd->CommonCfg.IOTestParm.bLastAtheros == TRUE) && ((STA_WEP_ON(pAd))||(STA_TKIP_ON(pAd)))) 1680 if ((pAd->CommonCfg.IOTestParm.bLastAtheros == TRUE) && ((STA_WEP_ON(pAd))||(STA_TKIP_ON(pAd))))
1701 { 1681 {
@@ -1715,7 +1695,6 @@ VOID LinkUp(
1715 { 1695 {
1716 pAd->CommonCfg.IOTestParm.bNextDisableRxBA = FALSE; 1696 pAd->CommonCfg.IOTestParm.bNextDisableRxBA = FALSE;
1717 } 1697 }
1718#endif // DOT11_N_SUPPORT //
1719 1698
1720 pAd->CommonCfg.IOTestParm.bLastAtheros = FALSE; 1699 pAd->CommonCfg.IOTestParm.bLastAtheros = FALSE;
1721 COPY_MAC_ADDR(pAd->CommonCfg.LastBssid, pAd->CommonCfg.Bssid); 1700 COPY_MAC_ADDR(pAd->CommonCfg.LastBssid, pAd->CommonCfg.Bssid);
@@ -1883,12 +1862,11 @@ VOID LinkDown(
1883 NdisZeroMemory(pAd->CommonCfg.Ssid, MAX_LEN_OF_SSID); 1862 NdisZeroMemory(pAd->CommonCfg.Ssid, MAX_LEN_OF_SSID);
1884 pAd->CommonCfg.SsidLen = 0; 1863 pAd->CommonCfg.SsidLen = 0;
1885 } 1864 }
1886#ifdef DOT11_N_SUPPORT 1865
1887 NdisZeroMemory(&pAd->MlmeAux.HtCapability, sizeof(HT_CAPABILITY_IE)); 1866 NdisZeroMemory(&pAd->MlmeAux.HtCapability, sizeof(HT_CAPABILITY_IE));
1888 NdisZeroMemory(&pAd->MlmeAux.AddHtInfo, sizeof(ADD_HT_INFO_IE)); 1867 NdisZeroMemory(&pAd->MlmeAux.AddHtInfo, sizeof(ADD_HT_INFO_IE));
1889 pAd->MlmeAux.HtCapabilityLen = 0; 1868 pAd->MlmeAux.HtCapabilityLen = 0;
1890 pAd->MlmeAux.NewExtChannelOffset = 0xff; 1869 pAd->MlmeAux.NewExtChannelOffset = 0xff;
1891#endif // DOT11_N_SUPPORT //
1892 1870
1893 // Reset WPA-PSK state. Only reset when supplicant enabled 1871 // Reset WPA-PSK state. Only reset when supplicant enabled
1894 if (pAd->StaCfg.WpaState != SS_NOTUSE) 1872 if (pAd->StaCfg.WpaState != SS_NOTUSE)
@@ -1970,7 +1948,6 @@ VOID LinkDown(
1970 pAd->CommonCfg.MlmeRate = pAd->CommonCfg.BasicMlmeRate; 1948 pAd->CommonCfg.MlmeRate = pAd->CommonCfg.BasicMlmeRate;
1971 pAd->CommonCfg.RtsRate = pAd->CommonCfg.BasicMlmeRate; 1949 pAd->CommonCfg.RtsRate = pAd->CommonCfg.BasicMlmeRate;
1972 1950
1973#ifdef DOT11_N_SUPPORT
1974 // 1951 //
1975 // After Link down, reset piggy-back setting in ASIC. Disable RDG. 1952 // After Link down, reset piggy-back setting in ASIC. Disable RDG.
1976 // 1953 //
@@ -1981,7 +1958,7 @@ VOID LinkDown(
1981 ByteValue &= (~0x18); 1958 ByteValue &= (~0x18);
1982 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, ByteValue); 1959 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, ByteValue);
1983 } 1960 }
1984#endif // DOT11_N_SUPPORT // 1961
1985 // Reset DAC 1962 // Reset DAC
1986 RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R1, &ByteValue); 1963 RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R1, &ByteValue);
1987 ByteValue &= (~0x18); 1964 ByteValue &= (~0x18);
@@ -1994,9 +1971,7 @@ VOID LinkDown(
1994 RTMPSetPiggyBack(pAd,FALSE); 1971 RTMPSetPiggyBack(pAd,FALSE);
1995 OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_PIGGYBACK_INUSED); 1972 OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_PIGGYBACK_INUSED);
1996 1973
1997#ifdef DOT11_N_SUPPORT
1998 pAd->CommonCfg.BACapability.word = pAd->CommonCfg.REGBACapability.word; 1974 pAd->CommonCfg.BACapability.word = pAd->CommonCfg.REGBACapability.word;
1999#endif // DOT11_N_SUPPORT //
2000 1975
2001 // Restore all settings in the following. 1976 // Restore all settings in the following.
2002 AsicUpdateProtect(pAd, 0, (ALLN_SETPROTECT|CCKSETPROTECT|OFDMSETPROTECT), TRUE, FALSE); 1977 AsicUpdateProtect(pAd, 0, (ALLN_SETPROTECT|CCKSETPROTECT|OFDMSETPROTECT), TRUE, FALSE);
@@ -2420,7 +2395,6 @@ ULONG MakeIbssBeacon(
2420 FrameLen += tmp; 2395 FrameLen += tmp;
2421 } 2396 }
2422 2397
2423#ifdef DOT11_N_SUPPORT
2424 if ((pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)) 2398 if ((pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED))
2425 { 2399 {
2426 ULONG TmpLen; 2400 ULONG TmpLen;
@@ -2441,7 +2415,6 @@ ULONG MakeIbssBeacon(
2441 2415
2442 FrameLen += TmpLen; 2416 FrameLen += TmpLen;
2443 } 2417 }
2444#endif // DOT11_N_SUPPORT //
2445 2418
2446 //beacon use reserved WCID 0xff 2419 //beacon use reserved WCID 0xff
2447 if (pAd->CommonCfg.Channel > 14) 2420 if (pAd->CommonCfg.Channel > 14)
diff --git a/drivers/staging/rt2870/sta/rtmp_data.c b/drivers/staging/rt2870/sta/rtmp_data.c
index 45b6c4768b3..e84cb6f3a98 100644
--- a/drivers/staging/rt2870/sta/rtmp_data.c
+++ b/drivers/staging/rt2870/sta/rtmp_data.c
@@ -182,13 +182,12 @@ VOID STARxDataFrameAnnounce(
182 else 182 else
183 { 183 {
184 RX_BLK_SET_FLAG(pRxBlk, fRX_EAP); 184 RX_BLK_SET_FLAG(pRxBlk, fRX_EAP);
185#ifdef DOT11_N_SUPPORT 185
186 if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMPDU) && (pAd->CommonCfg.bDisableReordering == 0)) 186 if (RX_BLK_TEST_FLAG(pRxBlk, fRX_AMPDU) && (pAd->CommonCfg.bDisableReordering == 0))
187 { 187 {
188 Indicate_AMPDU_Packet(pAd, pRxBlk, FromWhichBSSID); 188 Indicate_AMPDU_Packet(pAd, pRxBlk, FromWhichBSSID);
189 } 189 }
190 else 190 else
191#endif // DOT11_N_SUPPORT //
192 { 191 {
193 // Determin the destination of the EAP frame 192 // Determin the destination of the EAP frame
194 // to WPA state machine or upper layer 193 // to WPA state machine or upper layer
@@ -439,12 +438,10 @@ VOID STAHandleRxDataFrame(
439 else 438 else
440#endif 439#endif
441 { 440 {
442#ifdef DOT11_N_SUPPORT
443 RX_BLK_SET_FLAG(pRxBlk, fRX_HTC); 441 RX_BLK_SET_FLAG(pRxBlk, fRX_HTC);
444 // skip HTC contorl field 442 // skip HTC contorl field
445 pRxBlk->pData += 4; 443 pRxBlk->pData += 4;
446 pRxBlk->DataSize -= 4; 444 pRxBlk->DataSize -= 4;
447#endif // DOT11_N_SUPPORT //
448 } 445 }
449 } 446 }
450 447
@@ -457,13 +454,10 @@ VOID STAHandleRxDataFrame(
457 pRxBlk->pData += 2; 454 pRxBlk->pData += 2;
458 } 455 }
459 456
460#ifdef DOT11_N_SUPPORT
461 if (pRxD->BA) 457 if (pRxD->BA)
462 { 458 {
463 RX_BLK_SET_FLAG(pRxBlk, fRX_AMPDU); 459 RX_BLK_SET_FLAG(pRxBlk, fRX_AMPDU);
464 } 460 }
465#endif // DOT11_N_SUPPORT //
466
467 461
468 // 462 //
469 // Case I Process Broadcast & Multicast data frame 463 // Case I Process Broadcast & Multicast data frame
@@ -592,21 +586,17 @@ VOID STAHandleRxControlFrame(
592 IN PRTMP_ADAPTER pAd, 586 IN PRTMP_ADAPTER pAd,
593 IN RX_BLK *pRxBlk) 587 IN RX_BLK *pRxBlk)
594{ 588{
595#ifdef DOT11_N_SUPPORT
596 PRXWI_STRUC pRxWI = pRxBlk->pRxWI; 589 PRXWI_STRUC pRxWI = pRxBlk->pRxWI;
597#endif // DOT11_N_SUPPORT //
598 PHEADER_802_11 pHeader = pRxBlk->pHeader; 590 PHEADER_802_11 pHeader = pRxBlk->pHeader;
599 PNDIS_PACKET pRxPacket = pRxBlk->pRxPacket; 591 PNDIS_PACKET pRxPacket = pRxBlk->pRxPacket;
600 592
601 switch (pHeader->FC.SubType) 593 switch (pHeader->FC.SubType)
602 { 594 {
603 case SUBTYPE_BLOCK_ACK_REQ: 595 case SUBTYPE_BLOCK_ACK_REQ:
604#ifdef DOT11_N_SUPPORT
605 { 596 {
606 CntlEnqueueForRecv(pAd, pRxWI->WirelessCliID, (pRxWI->MPDUtotalByteCount), (PFRAME_BA_REQ)pHeader); 597 CntlEnqueueForRecv(pAd, pRxWI->WirelessCliID, (pRxWI->MPDUtotalByteCount), (PFRAME_BA_REQ)pHeader);
607 } 598 }
608 break; 599 break;
609#endif // DOT11_N_SUPPORT //
610 case SUBTYPE_BLOCK_ACK: 600 case SUBTYPE_BLOCK_ACK:
611 case SUBTYPE_ACK: 601 case SUBTYPE_ACK:
612 default: 602 default:
@@ -983,10 +973,8 @@ NDIS_STATUS STASendPacket(
983 NumberOfFrag = 1; // Aggregation overwhelms fragmentation 973 NumberOfFrag = 1; // Aggregation overwhelms fragmentation
984 else if (CLIENT_STATUS_TEST_FLAG(pEntry, fCLIENT_STATUS_AMSDU_INUSED)) 974 else if (CLIENT_STATUS_TEST_FLAG(pEntry, fCLIENT_STATUS_AMSDU_INUSED))
985 NumberOfFrag = 1; // Aggregation overwhelms fragmentation 975 NumberOfFrag = 1; // Aggregation overwhelms fragmentation
986#ifdef DOT11_N_SUPPORT
987 else if ((pAd->StaCfg.HTPhyMode.field.MODE == MODE_HTMIX) || (pAd->StaCfg.HTPhyMode.field.MODE == MODE_HTGREENFIELD)) 976 else if ((pAd->StaCfg.HTPhyMode.field.MODE == MODE_HTMIX) || (pAd->StaCfg.HTPhyMode.field.MODE == MODE_HTGREENFIELD))
988 NumberOfFrag = 1; // MIMO RATE overwhelms fragmentation 977 NumberOfFrag = 1; // MIMO RATE overwhelms fragmentation
989#endif // DOT11_N_SUPPORT //
990 else 978 else
991 { 979 {
992 // The calculated "NumberOfFrag" is a rough estimation because of various 980 // The calculated "NumberOfFrag" is a rough estimation because of various
@@ -1087,7 +1075,6 @@ NDIS_STATUS STASendPacket(
1087 } 1075 }
1088 RTMP_IRQ_UNLOCK(&pAd->irq_lock, IrqFlags); 1076 RTMP_IRQ_UNLOCK(&pAd->irq_lock, IrqFlags);
1089 1077
1090#ifdef DOT11_N_SUPPORT
1091 if ((pAd->CommonCfg.BACapability.field.AutoBA == TRUE)&& 1078 if ((pAd->CommonCfg.BACapability.field.AutoBA == TRUE)&&
1092 IS_HT_STA(pEntry)) 1079 IS_HT_STA(pEntry))
1093 { 1080 {
@@ -1106,7 +1093,6 @@ NDIS_STATUS STASendPacket(
1106 BAOriSessionSetUp(pAd, pEntry, 0, 0, 10, FALSE); 1093 BAOriSessionSetUp(pAd, pEntry, 0, 0, 10, FALSE);
1107 } 1094 }
1108 } 1095 }
1109#endif // DOT11_N_SUPPORT //
1110 1096
1111 pAd->RalinkCounters.OneSecOsTxCount[QueIdx]++; // TODO: for debug only. to be removed 1097 pAd->RalinkCounters.OneSecOsTxCount[QueIdx]++; // TODO: for debug only. to be removed
1112 return NDIS_STATUS_SUCCESS; 1098 return NDIS_STATUS_SUCCESS;
@@ -1426,7 +1412,6 @@ VOID STABuildCommon802_11Header(
1426 pHeader_802_11->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE); 1412 pHeader_802_11->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE);
1427} 1413}
1428 1414
1429#ifdef DOT11_N_SUPPORT
1430VOID STABuildCache802_11Header( 1415VOID STABuildCache802_11Header(
1431 IN RTMP_ADAPTER *pAd, 1416 IN RTMP_ADAPTER *pAd,
1432 IN TX_BLK *pTxBlk, 1417 IN TX_BLK *pTxBlk,
@@ -1468,7 +1453,6 @@ VOID STABuildCache802_11Header(
1468 else 1453 else
1469 pHeader80211->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE); 1454 pHeader80211->FC.PwrMgmt = (pAd->StaCfg.Psm == PWR_SAVE);
1470} 1455}
1471#endif // DOT11_N_SUPPORT //
1472 1456
1473static inline PUCHAR STA_Build_ARalink_Frame_Header( 1457static inline PUCHAR STA_Build_ARalink_Frame_Header(
1474 IN RTMP_ADAPTER *pAd, 1458 IN RTMP_ADAPTER *pAd,
@@ -1528,7 +1512,6 @@ static inline PUCHAR STA_Build_ARalink_Frame_Header(
1528 1512
1529} 1513}
1530 1514
1531#ifdef DOT11_N_SUPPORT
1532static inline PUCHAR STA_Build_AMSDU_Frame_Header( 1515static inline PUCHAR STA_Build_AMSDU_Frame_Header(
1533 IN RTMP_ADAPTER *pAd, 1516 IN RTMP_ADAPTER *pAd,
1534 IN TX_BLK *pTxBlk) 1517 IN TX_BLK *pTxBlk)
@@ -1850,7 +1833,6 @@ VOID STA_AMSDU_Frame_Tx(
1850 // 1833 //
1851 HAL_KickOutTx(pAd, pTxBlk, pTxBlk->QueIdx); 1834 HAL_KickOutTx(pAd, pTxBlk, pTxBlk->QueIdx);
1852} 1835}
1853#endif // DOT11_N_SUPPORT //
1854 1836
1855VOID STA_Legacy_Frame_Tx( 1837VOID STA_Legacy_Frame_Tx(
1856 IN PRTMP_ADAPTER pAd, 1838 IN PRTMP_ADAPTER pAd,
@@ -2361,14 +2343,12 @@ NDIS_STATUS STAHardTransmit(
2361 2343
2362 switch (pTxBlk->TxFrameType) 2344 switch (pTxBlk->TxFrameType)
2363 { 2345 {
2364#ifdef DOT11_N_SUPPORT
2365 case TX_AMPDU_FRAME: 2346 case TX_AMPDU_FRAME:
2366 STA_AMPDU_Frame_Tx(pAd, pTxBlk); 2347 STA_AMPDU_Frame_Tx(pAd, pTxBlk);
2367 break; 2348 break;
2368 case TX_AMSDU_FRAME: 2349 case TX_AMSDU_FRAME:
2369 STA_AMSDU_Frame_Tx(pAd, pTxBlk); 2350 STA_AMSDU_Frame_Tx(pAd, pTxBlk);
2370 break; 2351 break;
2371#endif // DOT11_N_SUPPORT //
2372 case TX_LEGACY_FRAME: 2352 case TX_LEGACY_FRAME:
2373 STA_Legacy_Frame_Tx(pAd, pTxBlk); 2353 STA_Legacy_Frame_Tx(pAd, pTxBlk);
2374 break; 2354 break;
diff --git a/drivers/staging/rt2870/sta/sanity.c b/drivers/staging/rt2870/sta/sanity.c
index 239872464be..7d530f60160 100644
--- a/drivers/staging/rt2870/sta/sanity.c
+++ b/drivers/staging/rt2870/sta/sanity.c
@@ -184,7 +184,6 @@ BOOLEAN PeerAssocRspSanity(
184 } 184 }
185 185
186 break; 186 break;
187#ifdef DOT11_N_SUPPORT
188 case IE_ADD_HT: 187 case IE_ADD_HT:
189 case IE_ADD_HT2: 188 case IE_ADD_HT2:
190 if (pEid->Len >= sizeof(ADD_HT_INFO_IE)) 189 if (pEid->Len >= sizeof(ADD_HT_INFO_IE))
@@ -213,7 +212,6 @@ BOOLEAN PeerAssocRspSanity(
213 { 212 {
214 DBGPRINT(RT_DEBUG_WARN, ("PeerAssocRspSanity - wrong IE_SECONDARY_CH_OFFSET. \n")); 213 DBGPRINT(RT_DEBUG_WARN, ("PeerAssocRspSanity - wrong IE_SECONDARY_CH_OFFSET. \n"));
215 } 214 }
216#endif // DOT11_N_SUPPORT //
217 break; 215 break;
218 case IE_AIRONET_CKIP: 216 case IE_AIRONET_CKIP:
219 // 0. Check Aironet IE length, it must be larger or equal to 28 217 // 0. Check Aironet IE length, it must be larger or equal to 28
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(
108 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS)) 108 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS))
109 return; 109 return;
110 110
111#ifdef DOT11_N_SUPPORT
112 if ((pAd->CommonCfg.BBPCurrentBW == BW_40) 111 if ((pAd->CommonCfg.BBPCurrentBW == BW_40)
113 ) 112 )
114 { 113 {
@@ -121,7 +120,6 @@ VOID BeaconTimeout(
121 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue); 120 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R4, BBPValue);
122 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - End of SCAN, restore to 40MHz channel %d, Total BSS[%02d]\n",pAd->CommonCfg.CentralChannel, pAd->ScanTab.BssNr)); 121 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - End of SCAN, restore to 40MHz channel %d, Total BSS[%02d]\n",pAd->CommonCfg.CentralChannel, pAd->ScanTab.BssNr));
123 } 122 }
124#endif // DOT11_N_SUPPORT //
125 123
126 MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_BEACON_TIMEOUT, 0, NULL); 124 MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_BEACON_TIMEOUT, 0, NULL);
127 RT28XX_MLME_HANDLER(pAd); 125 RT28XX_MLME_HANDLER(pAd);
@@ -475,7 +473,7 @@ VOID MlmeStartReqAction(
475 pAd->MlmeAux.ExtRateLen = pAd->CommonCfg.ExtRateLen; 473 pAd->MlmeAux.ExtRateLen = pAd->CommonCfg.ExtRateLen;
476 NdisMoveMemory(pAd->MlmeAux.ExtRate, pAd->CommonCfg.ExtRate, MAX_LEN_OF_SUPPORTED_RATES); 474 NdisMoveMemory(pAd->MlmeAux.ExtRate, pAd->CommonCfg.ExtRate, MAX_LEN_OF_SUPPORTED_RATES);
477 RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen); 475 RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen);
478#ifdef DOT11_N_SUPPORT 476
479 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) 477 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
480 { 478 {
481 RTMPUpdateHTIE(&pAd->CommonCfg.DesiredHtPhy, &pAd->StaCfg.DesiredHtPhyInfo.MCSSet[0], &pAd->MlmeAux.HtCapability, &pAd->MlmeAux.AddHtInfo); 479 RTMPUpdateHTIE(&pAd->CommonCfg.DesiredHtPhy, &pAd->StaCfg.DesiredHtPhyInfo.MCSSet[0], &pAd->MlmeAux.HtCapability, &pAd->MlmeAux.AddHtInfo);
@@ -484,7 +482,6 @@ VOID MlmeStartReqAction(
484 DBGPRINT(RT_DEBUG_TRACE, ("SYNC -pAd->StaActive.SupportedHtPhy.bHtEnable = TRUE\n")); 482 DBGPRINT(RT_DEBUG_TRACE, ("SYNC -pAd->StaActive.SupportedHtPhy.bHtEnable = TRUE\n"));
485 } 483 }
486 else 484 else
487#endif // DOT11_N_SUPPORT //
488 { 485 {
489 pAd->MlmeAux.HtCapabilityLen = 0; 486 pAd->MlmeAux.HtCapabilityLen = 0;
490 pAd->StaActive.SupportedPhyInfo.bHtEnable = FALSE; 487 pAd->StaActive.SupportedPhyInfo.bHtEnable = FALSE;
@@ -554,10 +551,9 @@ VOID PeerBeaconAtScanAction(
554 // Init Variable IE structure 551 // Init Variable IE structure
555 pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE; 552 pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE;
556 pVIE->Length = 0; 553 pVIE->Length = 0;
557#ifdef DOT11_N_SUPPORT 554
558 RTMPZeroMemory(&HtCapability, sizeof(HtCapability)); 555 RTMPZeroMemory(&HtCapability, sizeof(HtCapability));
559 RTMPZeroMemory(&AddHtInfo, sizeof(ADD_HT_INFO_IE)); 556 RTMPZeroMemory(&AddHtInfo, sizeof(ADD_HT_INFO_IE));
560#endif // DOT11_N_SUPPORT //
561 557
562 if (PeerBeaconAndProbeRspSanity(pAd, 558 if (PeerBeaconAndProbeRspSanity(pAd,
563 Elem->Msg, 559 Elem->Msg,
@@ -608,11 +604,9 @@ VOID PeerBeaconAtScanAction(
608 604
609 Rssi = RTMPMaxRssi(pAd, ConvertToRssi(pAd, Elem->Rssi0, RSSI_0), ConvertToRssi(pAd, Elem->Rssi1, RSSI_1), ConvertToRssi(pAd, Elem->Rssi2, RSSI_2)); 605 Rssi = RTMPMaxRssi(pAd, ConvertToRssi(pAd, Elem->Rssi0, RSSI_0), ConvertToRssi(pAd, Elem->Rssi1, RSSI_1), ConvertToRssi(pAd, Elem->Rssi2, RSSI_2));
610 606
611
612#ifdef DOT11_N_SUPPORT
613 if ((HtCapabilityLen > 0) || (PreNHtCapabilityLen > 0)) 607 if ((HtCapabilityLen > 0) || (PreNHtCapabilityLen > 0))
614 HtCapabilityLen = SIZE_HT_CAP_IE; 608 HtCapabilityLen = SIZE_HT_CAP_IE;
615#endif // DOT11_N_SUPPORT // 609
616 if ((pAd->StaCfg.CCXReqType != MSRN_TYPE_UNUSED) && (Channel == pAd->StaCfg.CCXScanChannel)) 610 if ((pAd->StaCfg.CCXReqType != MSRN_TYPE_UNUSED) && (Channel == pAd->StaCfg.CCXScanChannel))
617 { 611 {
618 Idx = BssTableSetEntry(pAd, &pAd->StaCfg.CCXBssTab, Bssid, Ssid, SsidLen, BssType, BeaconPeriod, 612 Idx = BssTableSetEntry(pAd, &pAd->StaCfg.CCXBssTab, Bssid, Ssid, SsidLen, BssType, BeaconPeriod,
@@ -682,9 +676,7 @@ VOID PeerBeaconAtJoinAction(
682 UCHAR HtCapabilityLen = 0, PreNHtCapabilityLen = 0; 676 UCHAR HtCapabilityLen = 0, PreNHtCapabilityLen = 0;
683 UCHAR AddHtInfoLen; 677 UCHAR AddHtInfoLen;
684 UCHAR NewExtChannelOffset = 0xff; 678 UCHAR NewExtChannelOffset = 0xff;
685#ifdef DOT11_N_SUPPORT
686 UCHAR CentralChannel; 679 UCHAR CentralChannel;
687#endif // DOT11_N_SUPPORT //
688 680
689 // Init Variable IE structure 681 // Init Variable IE structure
690 pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE; 682 pVIE = (PNDIS_802_11_VARIABLE_IEs) VarIE;
@@ -800,7 +792,7 @@ VOID PeerBeaconAtJoinAction(
800 RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen); 792 RTMPCheckRates(pAd, pAd->MlmeAux.ExtRate, &pAd->MlmeAux.ExtRateLen);
801 793
802 NdisZeroMemory(pAd->StaActive.SupportedPhyInfo.MCSSet, 16); 794 NdisZeroMemory(pAd->StaActive.SupportedPhyInfo.MCSSet, 16);
803#ifdef DOT11_N_SUPPORT 795
804 pAd->MlmeAux.NewExtChannelOffset = NewExtChannelOffset; 796 pAd->MlmeAux.NewExtChannelOffset = NewExtChannelOffset;
805 pAd->MlmeAux.HtCapabilityLen = HtCapabilityLen; 797 pAd->MlmeAux.HtCapabilityLen = HtCapabilityLen;
806 798
@@ -845,7 +837,6 @@ VOID PeerBeaconAtJoinAction(
845 837
846 } 838 }
847 else 839 else
848#endif // DOT11_N_SUPPORT //
849 { 840 {
850 // To prevent error, let legacy AP must have same CentralChannel and Channel. 841 // To prevent error, let legacy AP must have same CentralChannel and Channel.
851 if ((HtCapabilityLen == 0) && (PreNHtCapabilityLen == 0)) 842 if ((HtCapabilityLen == 0) && (PreNHtCapabilityLen == 0))
@@ -860,9 +851,7 @@ VOID PeerBeaconAtJoinAction(
860 851
861 // copy QOS related information 852 // copy QOS related information
862 if ((pAd->CommonCfg.bWmmCapable) 853 if ((pAd->CommonCfg.bWmmCapable)
863#ifdef DOT11_N_SUPPORT
864 || (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) 854 || (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
865#endif // DOT11_N_SUPPORT //
866 ) 855 )
867 { 856 {
868 NdisMoveMemory(&pAd->MlmeAux.APEdcaParm, &EdcaParm, sizeof(EDCA_PARM)); 857 NdisMoveMemory(&pAd->MlmeAux.APEdcaParm, &EdcaParm, sizeof(EDCA_PARM));
@@ -1003,14 +992,12 @@ VOID PeerBeacon(
1003 if (pAd->Mlme.CntlMachine.CurrState == CNTL_WAIT_DISASSOC) 992 if (pAd->Mlme.CntlMachine.CurrState == CNTL_WAIT_DISASSOC)
1004 return; 993 return;
1005 994
1006#ifdef DOT11_N_SUPPORT
1007 // Copy Control channel for this BSSID. 995 // Copy Control channel for this BSSID.
1008 if (AddHtInfoLen != 0) 996 if (AddHtInfoLen != 0)
1009 Channel = AddHtInfo.ControlChan; 997 Channel = AddHtInfo.ControlChan;
1010 998
1011 if ((HtCapabilityLen > 0) || (PreNHtCapabilityLen > 0)) 999 if ((HtCapabilityLen > 0) || (PreNHtCapabilityLen > 0))
1012 HtCapabilityLen = SIZE_HT_CAP_IE; 1000 HtCapabilityLen = SIZE_HT_CAP_IE;
1013#endif // DOT11_N_SUPPORT //
1014 1001
1015 // 1002 //
1016 // Housekeeping "SsidBssTab" table for later-on ROAMing usage. 1003 // Housekeeping "SsidBssTab" table for later-on ROAMing usage.
@@ -1248,7 +1235,6 @@ VOID PeerBeacon(
1248 DBGPRINT(RT_DEBUG_WARN, ("SYNC - AP changed B/G protection to %d\n", bUseBGProtection)); 1235 DBGPRINT(RT_DEBUG_WARN, ("SYNC - AP changed B/G protection to %d\n", bUseBGProtection));
1249 } 1236 }
1250 1237
1251#ifdef DOT11_N_SUPPORT
1252 // check Ht protection mode. and adhere to the Non-GF device indication by AP. 1238 // check Ht protection mode. and adhere to the Non-GF device indication by AP.
1253 if ((AddHtInfoLen != 0) && 1239 if ((AddHtInfoLen != 0) &&
1254 ((AddHtInfo.AddHtInfo2.OperaionMode != pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode) || 1240 ((AddHtInfo.AddHtInfo2.OperaionMode != pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode) ||
@@ -1265,7 +1251,6 @@ VOID PeerBeacon(
1265 1251
1266 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - AP changed N OperaionMode to %d\n", pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode)); 1252 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - AP changed N OperaionMode to %d\n", pAd->MlmeAux.AddHtInfo.AddHtInfo2.OperaionMode));
1267 } 1253 }
1268#endif // DOT11_N_SUPPORT //
1269 1254
1270 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_SHORT_PREAMBLE_INUSED) && 1255 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_SHORT_PREAMBLE_INUSED) &&
1271 ERP_IS_USE_BARKER_PREAMBLE(Erp)) 1256 ERP_IS_USE_BARKER_PREAMBLE(Erp))
@@ -1360,9 +1345,7 @@ VOID PeerProbeReqAction(
1360 UCHAR Addr2[MAC_ADDR_LEN]; 1345 UCHAR Addr2[MAC_ADDR_LEN];
1361 CHAR Ssid[MAX_LEN_OF_SSID]; 1346 CHAR Ssid[MAX_LEN_OF_SSID];
1362 UCHAR SsidLen; 1347 UCHAR SsidLen;
1363#ifdef DOT11_N_SUPPORT
1364 UCHAR HtLen, AddHtLen, NewExtLen; 1348 UCHAR HtLen, AddHtLen, NewExtLen;
1365#endif // DOT11_N_SUPPORT //
1366 HEADER_802_11 ProbeRspHdr; 1349 HEADER_802_11 ProbeRspHdr;
1367 NDIS_STATUS NStatus; 1350 NDIS_STATUS NStatus;
1368 PUCHAR pOutBuffer = NULL; 1351 PUCHAR pOutBuffer = NULL;
@@ -1435,7 +1418,7 @@ VOID PeerProbeReqAction(
1435 END_OF_ARGS); 1418 END_OF_ARGS);
1436 FrameLen += tmp; 1419 FrameLen += tmp;
1437 } 1420 }
1438#ifdef DOT11_N_SUPPORT 1421
1439 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) 1422 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED)
1440 { 1423 {
1441 ULONG TmpLen; 1424 ULONG TmpLen;
@@ -1468,7 +1451,7 @@ VOID PeerProbeReqAction(
1468 } 1451 }
1469 FrameLen += TmpLen; 1452 FrameLen += TmpLen;
1470 } 1453 }
1471#endif // DOT11_N_SUPPORT // 1454
1472 MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); 1455 MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen);
1473 MlmeFreeMemory(pAd, pOutBuffer); 1456 MlmeFreeMemory(pAd, pOutBuffer);
1474 } 1457 }
diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index d02488a6a29..e3294bee43c 100644
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -190,11 +190,9 @@ INT Set_FragTest_Proc(
190 IN PRTMP_ADAPTER pAdapter, 190 IN PRTMP_ADAPTER pAdapter,
191 IN PUCHAR arg); 191 IN PUCHAR arg);
192 192
193#ifdef DOT11_N_SUPPORT
194INT Set_TGnWifiTest_Proc( 193INT Set_TGnWifiTest_Proc(
195 IN PRTMP_ADAPTER pAd, 194 IN PRTMP_ADAPTER pAd,
196 IN PUCHAR arg); 195 IN PUCHAR arg);
197#endif // DOT11_N_SUPPORT //
198 196
199INT Set_LongRetryLimit_Proc( 197INT Set_LongRetryLimit_Proc(
200 IN PRTMP_ADAPTER pAdapter, 198 IN PRTMP_ADAPTER pAdapter,
@@ -224,7 +222,6 @@ static struct {
224 {"BGProtection", Set_BGProtection_Proc}, 222 {"BGProtection", Set_BGProtection_Proc},
225 {"RTSThreshold", Set_RTSThreshold_Proc}, 223 {"RTSThreshold", Set_RTSThreshold_Proc},
226 {"FragThreshold", Set_FragThreshold_Proc}, 224 {"FragThreshold", Set_FragThreshold_Proc},
227#ifdef DOT11_N_SUPPORT
228 {"HtBw", Set_HtBw_Proc}, 225 {"HtBw", Set_HtBw_Proc},
229 {"HtMcs", Set_HtMcs_Proc}, 226 {"HtMcs", Set_HtMcs_Proc},
230 {"HtGi", Set_HtGi_Proc}, 227 {"HtGi", Set_HtGi_Proc},
@@ -238,8 +235,6 @@ static struct {
238 {"HtBaDecline", Set_BADecline_Proc}, 235 {"HtBaDecline", Set_BADecline_Proc},
239 {"HtProtect", Set_HtProtect_Proc}, 236 {"HtProtect", Set_HtProtect_Proc},
240 {"HtMimoPs", Set_HtMimoPs_Proc}, 237 {"HtMimoPs", Set_HtMimoPs_Proc},
241#endif // DOT11_N_SUPPORT //
242
243#ifdef AGGREGATION_SUPPORT 238#ifdef AGGREGATION_SUPPORT
244 {"PktAggregate", Set_PktAggregate_Proc}, 239 {"PktAggregate", Set_PktAggregate_Proc},
245#endif 240#endif
@@ -264,10 +259,8 @@ static struct {
264#endif 259#endif
265 {"WpaSupport", Set_Wpa_Support}, 260 {"WpaSupport", Set_Wpa_Support},
266 {"FixedTxMode", Set_FixedTxMode_Proc}, 261 {"FixedTxMode", Set_FixedTxMode_Proc},
267#ifdef DOT11_N_SUPPORT
268 {"TGnWifiTest", Set_TGnWifiTest_Proc}, 262 {"TGnWifiTest", Set_TGnWifiTest_Proc},
269 {"ForceGF", Set_ForceGF_Proc}, 263 {"ForceGF", Set_ForceGF_Proc},
270#endif // DOT11_N_SUPPORT //
271 {"LongRetry", Set_LongRetryLimit_Proc}, 264 {"LongRetry", Set_LongRetryLimit_Proc},
272 {"ShortRetry", Set_ShortRetryLimit_Proc}, 265 {"ShortRetry", Set_ShortRetryLimit_Proc},
273 {NULL,} 266 {NULL,}
@@ -1888,7 +1881,6 @@ rt_private_get_statistics(struct net_device *dev, struct iw_request_info *info,
1888 return Status; 1881 return Status;
1889} 1882}
1890 1883
1891#ifdef DOT11_N_SUPPORT
1892void getBaInfo( 1884void getBaInfo(
1893 IN PRTMP_ADAPTER pAd, 1885 IN PRTMP_ADAPTER pAd,
1894 IN PUCHAR pOutBuf) 1886 IN PUCHAR pOutBuf)
@@ -1935,7 +1927,6 @@ void getBaInfo(
1935 1927
1936 return; 1928 return;
1937} 1929}
1938#endif // DOT11_N_SUPPORT //
1939 1930
1940static int 1931static int
1941rt_private_show(struct net_device *dev, struct iw_request_info *info, 1932rt_private_show(struct net_device *dev, struct iw_request_info *info,
@@ -1981,12 +1972,10 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info,
1981 case SHOW_CONN_STATUS: 1972 case SHOW_CONN_STATUS:
1982 if (MONITOR_ON(pAd)) 1973 if (MONITOR_ON(pAd))
1983 { 1974 {
1984#ifdef DOT11_N_SUPPORT
1985 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED && 1975 if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED &&
1986 pAd->CommonCfg.RegTransmitSetting.field.BW) 1976 pAd->CommonCfg.RegTransmitSetting.field.BW)
1987 sprintf(extra, "Monitor Mode(CentralChannel %d)\n", pAd->CommonCfg.CentralChannel); 1977 sprintf(extra, "Monitor Mode(CentralChannel %d)\n", pAd->CommonCfg.CentralChannel);
1988 else 1978 else
1989#endif // DOT11_N_SUPPORT //
1990 sprintf(extra, "Monitor Mode(Channel %d)\n", pAd->CommonCfg.Channel); 1979 sprintf(extra, "Monitor Mode(Channel %d)\n", pAd->CommonCfg.Channel);
1991 } 1980 }
1992 else 1981 else
@@ -2020,12 +2009,10 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info,
2020 sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); 2009 sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ );
2021 wrq->length = strlen(extra) + 1; // 1: size of '\0' 2010 wrq->length = strlen(extra) + 1; // 1: size of '\0'
2022 break; 2011 break;
2023#ifdef DOT11_N_SUPPORT
2024 case SHOW_BA_INFO: 2012 case SHOW_BA_INFO:
2025 getBaInfo(pAd, extra); 2013 getBaInfo(pAd, extra);
2026 wrq->length = strlen(extra) + 1; // 1: size of '\0' 2014 wrq->length = strlen(extra) + 1; // 1: size of '\0'
2027 break; 2015 break;
2028#endif // DOT11_N_SUPPORT //
2029 case SHOW_DESC_INFO: 2016 case SHOW_DESC_INFO:
2030 { 2017 {
2031 Show_DescInfo_Proc(pAd, NULL); 2018 Show_DescInfo_Proc(pAd, NULL);
@@ -2868,9 +2855,7 @@ int rt_ioctl_siwrate(struct net_device *dev,
2868 (pAd->MacTab.Content[BSSID_WCID].HTPhyMode.field.MODE <= MODE_OFDM)) 2855 (pAd->MacTab.Content[BSSID_WCID].HTPhyMode.field.MODE <= MODE_OFDM))
2869 RTMPSetDesiredRates(pAd, -1); 2856 RTMPSetDesiredRates(pAd, -1);
2870 2857
2871#ifdef DOT11_N_SUPPORT
2872 SetCommonHT(pAd); 2858 SetCommonHT(pAd);
2873#endif // DOT11_N_SUPPORT //
2874 } 2859 }
2875 else 2860 else
2876 { 2861 {
@@ -2883,9 +2868,7 @@ int rt_ioctl_siwrate(struct net_device *dev,
2883 else 2868 else
2884 { 2869 {
2885 pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO; 2870 pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO;
2886#ifdef DOT11_N_SUPPORT
2887 SetCommonHT(pAd); 2871 SetCommonHT(pAd);
2888#endif // DOT11_N_SUPPORT //
2889 } 2872 }
2890 DBGPRINT(RT_DEBUG_TRACE, ("rt_ioctl_siwrate::(HtMcs=%d)\n",pAd->StaCfg.DesiredTransmitSetting.field.MCS)); 2873 DBGPRINT(RT_DEBUG_TRACE, ("rt_ioctl_siwrate::(HtMcs=%d)\n",pAd->StaCfg.DesiredTransmitSetting.field.MCS));
2891 } 2874 }
@@ -2933,14 +2916,12 @@ int rt_ioctl_giwrate(struct net_device *dev,
2933 else 2916 else
2934 ht_setting.word = pAd->MacTab.Content[BSSID_WCID].HTPhyMode.word; 2917 ht_setting.word = pAd->MacTab.Content[BSSID_WCID].HTPhyMode.word;
2935 2918
2936#ifdef DOT11_N_SUPPORT
2937 if (ht_setting.field.MODE >= MODE_HTMIX) 2919 if (ht_setting.field.MODE >= MODE_HTMIX)
2938 { 2920 {
2939// rate_index = 12 + ((UCHAR)ht_setting.field.BW *16) + ((UCHAR)ht_setting.field.ShortGI *32) + ((UCHAR)ht_setting.field.MCS); 2921// rate_index = 12 + ((UCHAR)ht_setting.field.BW *16) + ((UCHAR)ht_setting.field.ShortGI *32) + ((UCHAR)ht_setting.field.MCS);
2940 rate_index = 12 + ((UCHAR)ht_setting.field.BW *24) + ((UCHAR)ht_setting.field.ShortGI *48) + ((UCHAR)ht_setting.field.MCS); 2922 rate_index = 12 + ((UCHAR)ht_setting.field.BW *24) + ((UCHAR)ht_setting.field.ShortGI *48) + ((UCHAR)ht_setting.field.MCS);
2941 } 2923 }
2942 else 2924 else
2943#endif // DOT11_N_SUPPORT //
2944 if (ht_setting.field.MODE == MODE_OFDM) 2925 if (ht_setting.field.MODE == MODE_OFDM)
2945 rate_index = (UCHAR)(ht_setting.field.MCS) + 4; 2926 rate_index = (UCHAR)(ht_setting.field.MCS) + 4;
2946 else if (ht_setting.field.MODE == MODE_CCK) 2927 else if (ht_setting.field.MODE == MODE_CCK)
@@ -3105,18 +3086,13 @@ INT RTMPSetInformation(
3105 ULONG PowerTemp; 3086 ULONG PowerTemp;
3106 BOOLEAN RadioState; 3087 BOOLEAN RadioState;
3107 BOOLEAN StateMachineTouched = FALSE; 3088 BOOLEAN StateMachineTouched = FALSE;
3108#ifdef DOT11_N_SUPPORT
3109 OID_SET_HT_PHYMODE HT_PhyMode; //11n ,kathy 3089 OID_SET_HT_PHYMODE HT_PhyMode; //11n ,kathy
3110#endif // DOT11_N_SUPPORT //
3111 PNDIS_802_11_PMKID pPmkId = NULL; 3090 PNDIS_802_11_PMKID pPmkId = NULL;
3112 BOOLEAN IEEE8021xState = FALSE; 3091 BOOLEAN IEEE8021xState = FALSE;
3113 BOOLEAN IEEE8021x_required_keys = FALSE; 3092 BOOLEAN IEEE8021x_required_keys = FALSE;
3114 UCHAR wpa_supplicant_enable = 0; 3093 UCHAR wpa_supplicant_enable = 0;
3115 3094
3116#ifdef DOT11_N_SUPPORT
3117 MaxPhyMode = PHY_11N_5G; 3095 MaxPhyMode = PHY_11N_5G;
3118#endif // DOT11_N_SUPPORT //
3119
3120 3096
3121 DBGPRINT(RT_DEBUG_TRACE, ("-->RTMPSetInformation(), 0x%08x\n", cmd&0x7FFF)); 3097 DBGPRINT(RT_DEBUG_TRACE, ("-->RTMPSetInformation(), 0x%08x\n", cmd&0x7FFF));
3122 switch(cmd & 0x7FFF) { 3098 switch(cmd & 0x7FFF) {
@@ -3136,9 +3112,7 @@ INT RTMPSetInformation(
3136 pAdapter->CommonCfg.PhyMode = 0xff; 3112 pAdapter->CommonCfg.PhyMode = 0xff;
3137 // Build all corresponding channel information 3113 // Build all corresponding channel information
3138 RTMPSetPhyMode(pAdapter, TmpPhy); 3114 RTMPSetPhyMode(pAdapter, TmpPhy);
3139#ifdef DOT11_N_SUPPORT
3140 SetCommonHT(pAdapter); 3115 SetCommonHT(pAdapter);
3141#endif // DOT11_N_SUPPORT //
3142 DBGPRINT(RT_DEBUG_TRACE, ("Set::RT_OID_802_11_COUNTRY_REGION (A:%d B/G:%d)\n", pAdapter->CommonCfg.CountryRegionForABand, 3116 DBGPRINT(RT_DEBUG_TRACE, ("Set::RT_OID_802_11_COUNTRY_REGION (A:%d B/G:%d)\n", pAdapter->CommonCfg.CountryRegionForABand,
3143 pAdapter->CommonCfg.CountryRegion)); 3117 pAdapter->CommonCfg.CountryRegion));
3144 } 3118 }
@@ -3316,9 +3290,7 @@ INT RTMPSetInformation(
3316 if (PhyMode <= MaxPhyMode) 3290 if (PhyMode <= MaxPhyMode)
3317 { 3291 {
3318 RTMPSetPhyMode(pAdapter, PhyMode); 3292 RTMPSetPhyMode(pAdapter, PhyMode);
3319#ifdef DOT11_N_SUPPORT
3320 SetCommonHT(pAdapter); 3293 SetCommonHT(pAdapter);
3321#endif // DOT11_N_SUPPORT //
3322 } 3294 }
3323 DBGPRINT(RT_DEBUG_TRACE, ("Set::RT_OID_802_11_PHY_MODE (=%d)\n", PhyMode)); 3295 DBGPRINT(RT_DEBUG_TRACE, ("Set::RT_OID_802_11_PHY_MODE (=%d)\n", PhyMode));
3324 } 3296 }
@@ -3596,10 +3568,10 @@ INT RTMPSetInformation(
3596 RTMPSetPhyMode(pAdapter, PHY_11A); 3568 RTMPSetPhyMode(pAdapter, PHY_11A);
3597 else 3569 else
3598 Status = -EINVAL; 3570 Status = -EINVAL;
3599#ifdef DOT11_N_SUPPORT 3571
3600 if (Status == NDIS_STATUS_SUCCESS) 3572 if (Status == NDIS_STATUS_SUCCESS)
3601 SetCommonHT(pAdapter); 3573 SetCommonHT(pAdapter);
3602#endif // DOT11_N_SUPPORT // 3574
3603 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_NETWORK_TYPE_IN_USE (=%d)\n",NetType)); 3575 DBGPRINT(RT_DEBUG_TRACE, ("Set::OID_802_11_NETWORK_TYPE_IN_USE (=%d)\n",NetType));
3604 } 3576 }
3605 break; 3577 break;
@@ -3743,7 +3715,6 @@ INT RTMPSetInformation(
3743 pAdapter->bConfigChanged = TRUE; 3715 pAdapter->bConfigChanged = TRUE;
3744 } 3716 }
3745 break; 3717 break;
3746#ifdef DOT11_N_SUPPORT
3747 case RT_OID_802_11_SET_HT_PHYMODE: 3718 case RT_OID_802_11_SET_HT_PHYMODE:
3748 if (wrq->u.data.length != sizeof(OID_SET_HT_PHYMODE)) 3719 if (wrq->u.data.length != sizeof(OID_SET_HT_PHYMODE))
3749 Status = -EINVAL; 3720 Status = -EINVAL;
@@ -3762,7 +3733,6 @@ INT RTMPSetInformation(
3762 pAdapter->StaCfg.HTPhyMode.field.MCS, pAdapter->StaCfg.HTPhyMode.field.BW, pAdapter->StaCfg.HTPhyMode.field.ShortGI, 3733 pAdapter->StaCfg.HTPhyMode.field.MCS, pAdapter->StaCfg.HTPhyMode.field.BW, pAdapter->StaCfg.HTPhyMode.field.ShortGI,
3763 pAdapter->StaCfg.HTPhyMode.field.STBC)); 3734 pAdapter->StaCfg.HTPhyMode.field.STBC));
3764 break; 3735 break;
3765#endif // DOT11_N_SUPPORT //
3766 case RT_OID_802_11_SET_APSD_SETTING: 3736 case RT_OID_802_11_SET_APSD_SETTING:
3767 if (wrq->u.data.length != sizeof(ULONG)) 3737 if (wrq->u.data.length != sizeof(ULONG))
3768 Status = -EINVAL; 3738 Status = -EINVAL;
@@ -3845,8 +3815,6 @@ INT RTMPSetInformation(
3845 StateMachineTouched = TRUE; 3815 StateMachineTouched = TRUE;
3846 } 3816 }
3847 break; 3817 break;
3848
3849#ifdef DOT11_N_SUPPORT
3850 case RT_OID_802_11_SET_IMME_BA_CAP: 3818 case RT_OID_802_11_SET_IMME_BA_CAP:
3851 if (wrq->u.data.length != sizeof(OID_BACAP_STRUC)) 3819 if (wrq->u.data.length != sizeof(OID_BACAP_STRUC))
3852 Status = -EINVAL; 3820 Status = -EINVAL;
@@ -4001,8 +3969,6 @@ INT RTMPSetInformation(
4001 } 3969 }
4002 } 3970 }
4003 break; 3971 break;
4004#endif // DOT11_N_SUPPORT //
4005
4006 // For WPA_SUPPLICANT to set static wep key 3972 // For WPA_SUPPLICANT to set static wep key
4007 case OID_802_11_ADD_WEP: 3973 case OID_802_11_ADD_WEP:
4008 pWepKey = kmalloc(wrq->u.data.length, MEM_ALLOC_FLAG); 3974 pWepKey = kmalloc(wrq->u.data.length, MEM_ALLOC_FLAG);
@@ -5342,19 +5308,14 @@ INT Set_NetworkType_Proc(
5342 DBGPRINT(RT_DEBUG_TRACE, ("fOP_STATUS_MEDIA_STATE_CONNECTED \n")); 5308 DBGPRINT(RT_DEBUG_TRACE, ("fOP_STATUS_MEDIA_STATE_CONNECTED \n"));
5343 if (pAdapter->CommonCfg.CentralChannel == 0) 5309 if (pAdapter->CommonCfg.CentralChannel == 0)
5344 { 5310 {
5345#ifdef DOT11_N_SUPPORT
5346 if (pAdapter->CommonCfg.PhyMode == PHY_11AN_MIXED) 5311 if (pAdapter->CommonCfg.PhyMode == PHY_11AN_MIXED)
5347 pAdapter->CommonCfg.CentralChannel = 36; 5312 pAdapter->CommonCfg.CentralChannel = 36;
5348 else 5313 else
5349#endif // DOT11_N_SUPPORT //
5350 pAdapter->CommonCfg.CentralChannel = 6; 5314 pAdapter->CommonCfg.CentralChannel = 6;
5351 } 5315 }
5352#ifdef DOT11_N_SUPPORT
5353 else 5316 else
5354 N_ChannelCheck(pAdapter); 5317 N_ChannelCheck(pAdapter);
5355#endif // DOT11_N_SUPPORT //
5356 5318
5357#ifdef DOT11_N_SUPPORT
5358 if (pAdapter->CommonCfg.PhyMode >= PHY_11ABGN_MIXED && 5319 if (pAdapter->CommonCfg.PhyMode >= PHY_11ABGN_MIXED &&
5359 pAdapter->CommonCfg.RegTransmitSetting.field.BW == BW_40 && 5320 pAdapter->CommonCfg.RegTransmitSetting.field.BW == BW_40 &&
5360 pAdapter->CommonCfg.RegTransmitSetting.field.EXTCHA == EXTCHA_ABOVE) 5321 pAdapter->CommonCfg.RegTransmitSetting.field.EXTCHA == EXTCHA_ABOVE)
@@ -5405,7 +5366,6 @@ INT Set_NetworkType_Proc(
5405 pAdapter->CommonCfg.CentralChannel)); 5366 pAdapter->CommonCfg.CentralChannel));
5406 } 5367 }
5407 else 5368 else
5408#endif // DOT11_N_SUPPORT //
5409 { 5369 {
5410 // 20MHz 5370 // 20MHz
5411 RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, BBP_R4, &bbpValue); 5371 RTMP_BBP_IO_READ8_BY_REG_ID(pAdapter, BBP_R4, &bbpValue);
@@ -6426,9 +6386,7 @@ INT Show_Adhoc_MacTable_Proc(
6426 6386
6427 sprintf(extra, "\n"); 6387 sprintf(extra, "\n");
6428 6388
6429#ifdef DOT11_N_SUPPORT
6430 sprintf(extra + strlen(extra), "HT Operating Mode : %d\n", pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode); 6389 sprintf(extra + strlen(extra), "HT Operating Mode : %d\n", pAd->CommonCfg.AddHTInfo.AddHtInfo2.OperaionMode);
6431#endif // DOT11_N_SUPPORT //
6432 6390
6433 sprintf(extra + strlen(extra), "\n%-19s%-4s%-4s%-7s%-7s%-7s%-10s%-6s%-6s%-6s%-6s\n", 6391 sprintf(extra + strlen(extra), "\n%-19s%-4s%-4s%-7s%-7s%-7s%-10s%-6s%-6s%-6s%-6s\n",
6434 "MAC", "AID", "BSS", "RSSI0", "RSSI1", "RSSI2", "PhMd", "BW", "MCS", "SGI", "STBC"); 6392 "MAC", "AID", "BSS", "RSSI0", "RSSI1", "RSSI2", "PhMd", "BW", "MCS", "SGI", "STBC");
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-20 17:59:28 -0400