aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/rt3070/2870_main_dev.c13
-rw-r--r--drivers/staging/rt3070/Makefile1
-rw-r--r--drivers/staging/rt3070/common/2870_rtmp_init.c9
-rw-r--r--drivers/staging/rt3070/common/action.c16
-rw-r--r--drivers/staging/rt3070/common/ba_action.c21
-rw-r--r--drivers/staging/rt3070/common/cmm_data.c53
-rw-r--r--drivers/staging/rt3070/common/cmm_data_2870.c14
-rw-r--r--drivers/staging/rt3070/common/cmm_info.c86
-rw-r--r--drivers/staging/rt3070/common/cmm_sanity.c25
-rw-r--r--drivers/staging/rt3070/common/cmm_sync.c23
-rw-r--r--drivers/staging/rt3070/common/cmm_wpa.c7
-rw-r--r--drivers/staging/rt3070/common/mlme.c130
-rw-r--r--drivers/staging/rt3070/common/rtmp_init.c34
-rw-r--r--drivers/staging/rt3070/common/rtmp_tkip.c3
-rw-r--r--drivers/staging/rt3070/common/rtmp_wep.c2
-rw-r--r--drivers/staging/rt3070/common/rtusb_bulk.c6
-rw-r--r--drivers/staging/rt3070/common/rtusb_io.c15
-rw-r--r--drivers/staging/rt3070/common/spectrum.c5
-rw-r--r--drivers/staging/rt3070/mlme.h11
-rw-r--r--drivers/staging/rt3070/oid.h21
-rw-r--r--drivers/staging/rt3070/rt_config.h7
-rw-r--r--drivers/staging/rt3070/rt_linux.c15
-rw-r--r--drivers/staging/rt3070/rt_linux.h13
-rw-r--r--drivers/staging/rt3070/rt_main_dev.c41
-rw-r--r--drivers/staging/rt3070/rt_profile.c46
-rw-r--r--drivers/staging/rt3070/rtmp.h68
-rw-r--r--drivers/staging/rt3070/rtmp_def.h2
27 files changed, 36 insertions, 651 deletions
diff --git a/drivers/staging/rt3070/2870_main_dev.c b/drivers/staging/rt3070/2870_main_dev.c
index 1783811b92c..667a2665039 100644
--- a/drivers/staging/rt3070/2870_main_dev.c
+++ b/drivers/staging/rt3070/2870_main_dev.c
@@ -46,12 +46,10 @@
46// Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. *** 46// Otherwise post to forum in ralinktech's web site(www.ralinktech.com) and let all users help you. ***
47MODULE_AUTHOR("Paul Lin <paul_lin@ralinktech.com>"); 47MODULE_AUTHOR("Paul Lin <paul_lin@ralinktech.com>");
48MODULE_DESCRIPTION("RT2870 Wireless Lan Linux Driver"); 48MODULE_DESCRIPTION("RT2870 Wireless Lan Linux Driver");
49#ifdef CONFIG_STA_SUPPORT
50MODULE_LICENSE("GPL"); 49MODULE_LICENSE("GPL");
51#ifdef MODULE_VERSION 50#ifdef MODULE_VERSION
52MODULE_VERSION(STA_DRIVER_VERSION); 51MODULE_VERSION(STA_DRIVER_VERSION);
53#endif 52#endif
54#endif // CONFIG_STA_SUPPORT //
55 53
56/* Kernel thread and vars, which handles packets that are completed. Only 54/* Kernel thread and vars, which handles packets that are completed. Only
57 * packets that have a "complete" function are sent here. This way, the 55 * packets that have a "complete" function are sent here. This way, the
@@ -614,7 +612,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd)
614 } 612 }
615 613
616//PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) 614//PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
617#ifdef CONFIG_STA_SUPPORT
618 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 615 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
619 { 616 {
620 idx = 0; 617 idx = 0;
@@ -630,7 +627,6 @@ VOID RT2870_WatchDog(IN RTMP_ADAPTER *pAd)
630 RTMP_IO_WRITE32(pAd, PBF_CFG, 0xf40006); 627 RTMP_IO_WRITE32(pAd, PBF_CFG, 0xf40006);
631 } 628 }
632 } 629 }
633#endif // CONFIG_STA_SUPPORT //
634 630
635 if (pAd->watchDogRxOverFlowCnt >= 2) 631 if (pAd->watchDogRxOverFlowCnt >= 2)
636 { 632 {
@@ -1318,13 +1314,10 @@ VOID RT2870_BssBeaconStop(
1318 { 1314 {
1319 INT NumOfBcn; 1315 INT NumOfBcn;
1320 1316
1321
1322#ifdef CONFIG_STA_SUPPORT
1323 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1317 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1324 { 1318 {
1325 NumOfBcn = MAX_MESH_NUM; 1319 NumOfBcn = MAX_MESH_NUM;
1326 } 1320 }
1327#endif // CONFIG_STA_SUPPORT //
1328 1321
1329 RTMPCancelTimer(&pAd->CommonCfg.BeaconUpdateTimer, &Cancelled); 1322 RTMPCancelTimer(&pAd->CommonCfg.BeaconUpdateTimer, &Cancelled);
1330 1323
@@ -1357,22 +1350,16 @@ VOID RT2870_BssBeaconStart(
1357 { 1350 {
1358 INT NumOfBcn; 1351 INT NumOfBcn;
1359 1352
1360
1361#ifdef CONFIG_STA_SUPPORT
1362 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1353 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1363 { 1354 {
1364 NumOfBcn = MAX_MESH_NUM; 1355 NumOfBcn = MAX_MESH_NUM;
1365 } 1356 }
1366#endif // CONFIG_STA_SUPPORT //
1367 1357
1368 for(apidx=0; apidx<NumOfBcn; apidx++) 1358 for(apidx=0; apidx<NumOfBcn; apidx++)
1369 { 1359 {
1370 UCHAR CapabilityInfoLocationInBeacon = 0; 1360 UCHAR CapabilityInfoLocationInBeacon = 0;
1371 UCHAR TimIELocationInBeacon = 0; 1361 UCHAR TimIELocationInBeacon = 0;
1372 1362
1373#ifdef CONFIG_STA_SUPPORT
1374#endif // CONFIG_STA_SUPPORT //
1375
1376 NdisZeroMemory(pBeaconSync->BeaconBuf[apidx], HW_BEACON_OFFSET); 1363 NdisZeroMemory(pBeaconSync->BeaconBuf[apidx], HW_BEACON_OFFSET);
1377 pBeaconSync->CapabilityInfoLocationInBeacon[apidx] = CapabilityInfoLocationInBeacon; 1364 pBeaconSync->CapabilityInfoLocationInBeacon[apidx] = CapabilityInfoLocationInBeacon;
1378 pBeaconSync->TimIELocationInBeacon[apidx] = TimIELocationInBeacon; 1365 pBeaconSync->TimIELocationInBeacon[apidx] = TimIELocationInBeacon;
diff --git a/drivers/staging/rt3070/Makefile b/drivers/staging/rt3070/Makefile
index 55980c92925..da1cc1e4359 100644
--- a/drivers/staging/rt3070/Makefile
+++ b/drivers/staging/rt3070/Makefile
@@ -3,7 +3,6 @@ obj-$(CONFIG_RT3070) += rt3070sta.o
3# TODO: all of these should be removed 3# TODO: all of these should be removed
4EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT 4EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
5EXTRA_CFLAGS += -DRT2870 -DRT30xx -DRT3070 5EXTRA_CFLAGS += -DRT2870 -DRT30xx -DRT3070
6EXTRA_CFLAGS += -DCONFIG_STA_SUPPORT
7EXTRA_CFLAGS += -DDBG 6EXTRA_CFLAGS += -DDBG
8EXTRA_CFLAGS += -DDOT11_N_SUPPORT 7EXTRA_CFLAGS += -DDOT11_N_SUPPORT
9EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT 8EXTRA_CFLAGS += -DWPA_SUPPLICANT_SUPPORT
diff --git a/drivers/staging/rt3070/common/2870_rtmp_init.c b/drivers/staging/rt3070/common/2870_rtmp_init.c
index 5433fcc4537..b55b8ad4800 100644
--- a/drivers/staging/rt3070/common/2870_rtmp_init.c
+++ b/drivers/staging/rt3070/common/2870_rtmp_init.c
@@ -234,10 +234,8 @@ NDIS_STATUS NICInitTransmit(
234 // 234 //
235 // TX_RING_SIZE, 4 ACs 235 // TX_RING_SIZE, 4 ACs
236 // 236 //
237#ifdef CONFIG_STA_SUPPORT
238 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 237 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
239 for(acidx=0; acidx<4; acidx++) 238 for(acidx=0; acidx<4; acidx++)
240#endif // CONFIG_STA_SUPPORT //
241 { 239 {
242#if 1 //def DOT11_N_SUPPORT 240#if 1 //def DOT11_N_SUPPORT
243 PHT_TX_CONTEXT pHTTXContext = &(pAd->TxContext[acidx]); 241 PHT_TX_CONTEXT pHTTXContext = &(pAd->TxContext[acidx]);
@@ -436,10 +434,8 @@ out2:
436 } 434 }
437 435
438out1: 436out1:
439#ifdef CONFIG_STA_SUPPORT
440 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 437 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
441 for(acidx=0; acidx<4; acidx++) 438 for(acidx=0; acidx<4; acidx++)
442#endif // CONFIG_STA_SUPPORT //
443 { 439 {
444 PHT_TX_CONTEXT pTxContext = &(pAd->TxContext[acidx]); 440 PHT_TX_CONTEXT pTxContext = &(pAd->TxContext[acidx]);
445 if (pTxContext) 441 if (pTxContext)
@@ -646,10 +642,8 @@ VOID RTMPFreeTxRxRingMemory(
646 642
647 643
648 // Free Tx frame resource 644 // Free Tx frame resource
649#ifdef CONFIG_STA_SUPPORT
650 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 645 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
651 for(acidx=0; acidx<4; acidx++) 646 for(acidx=0; acidx<4; acidx++)
652#endif // CONFIG_STA_SUPPORT //
653 { 647 {
654 PHT_TX_CONTEXT pHTTXContext = &(pAd->TxContext[acidx]); 648 PHT_TX_CONTEXT pHTTXContext = &(pAd->TxContext[acidx]);
655 if (pHTTXContext) 649 if (pHTTXContext)
@@ -810,8 +804,6 @@ NDIS_STATUS CreateThreads(
810 return NDIS_STATUS_SUCCESS; 804 return NDIS_STATUS_SUCCESS;
811} 805}
812 806
813
814#ifdef CONFIG_STA_SUPPORT
815/* 807/*
816======================================================================== 808========================================================================
817Routine Description: 809Routine Description:
@@ -992,7 +984,6 @@ VOID RTMPAddBSSIDCipher(
992 DBGPRINT_RAW(RT_DEBUG_TRACE,(" %x:", pKey->KeyMaterial[i])); 984 DBGPRINT_RAW(RT_DEBUG_TRACE,(" %x:", pKey->KeyMaterial[i]));
993 DBGPRINT(RT_DEBUG_TRACE,(" \n")); 985 DBGPRINT(RT_DEBUG_TRACE,(" \n"));
994} 986}
995#endif // CONFIG_STA_SUPPORT //
996 987
997/* 988/*
998======================================================================== 989========================================================================
diff --git a/drivers/staging/rt3070/common/action.c b/drivers/staging/rt3070/common/action.c
index e36f90f46a4..c31d367908a 100644
--- a/drivers/staging/rt3070/common/action.c
+++ b/drivers/staging/rt3070/common/action.c
@@ -128,7 +128,6 @@ VOID MlmeADDBAAction(
128 pBAEntry =&pAd->BATable.BAOriEntry[Idx]; 128 pBAEntry =&pAd->BATable.BAOriEntry[Idx];
129 } 129 }
130 130
131#ifdef CONFIG_STA_SUPPORT
132 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 131 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
133 { 132 {
134 if (ADHOC_ON(pAd)) 133 if (ADHOC_ON(pAd))
@@ -137,7 +136,6 @@ VOID MlmeADDBAAction(
137 ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pInfo->pAddr); 136 ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pInfo->pAddr);
138 137
139 } 138 }
140#endif // CONFIG_STA_SUPPORT //
141 139
142 Frame.Category = CATEGORY_BA; 140 Frame.Category = CATEGORY_BA;
143 Frame.Action = ADDBA_REQ; 141 Frame.Action = ADDBA_REQ;
@@ -214,10 +212,8 @@ VOID MlmeDELBAAction(
214 // SEND BAR (Send BAR to refresh peer reordering buffer.) 212 // SEND BAR (Send BAR to refresh peer reordering buffer.)
215 Idx = pAd->MacTab.Content[pInfo->Wcid].BAOriWcidArray[pInfo->TID]; 213 Idx = pAd->MacTab.Content[pInfo->Wcid].BAOriWcidArray[pInfo->TID];
216 214
217#ifdef CONFIG_STA_SUPPORT
218 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 215 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
219 BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress); 216 BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress);
220#endif // CONFIG_STA_SUPPORT //
221 217
222 FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL funciton. 218 FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL funciton.
223 FrameBar.StartingSeq.field.StartSeq = pAd->MacTab.Content[pInfo->Wcid].TxSeq[pInfo->TID]; // make sure sequence not clear in DEL funciton. 219 FrameBar.StartingSeq.field.StartSeq = pAd->MacTab.Content[pInfo->Wcid].TxSeq[pInfo->TID]; // make sure sequence not clear in DEL funciton.
@@ -235,7 +231,7 @@ VOID MlmeDELBAAction(
235 231
236 // SEND DELBA FRAME 232 // SEND DELBA FRAME
237 FrameLen = 0; 233 FrameLen = 0;
238#ifdef CONFIG_STA_SUPPORT 234
239 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 235 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
240 { 236 {
241 if (ADHOC_ON(pAd)) 237 if (ADHOC_ON(pAd))
@@ -243,7 +239,7 @@ VOID MlmeDELBAAction(
243 else 239 else
244 ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[pInfo->Wcid].Addr); 240 ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[pInfo->Wcid].Addr);
245 } 241 }
246#endif // CONFIG_STA_SUPPORT // 242
247 Frame.Category = CATEGORY_BA; 243 Frame.Category = CATEGORY_BA;
248 Frame.Action = DELBA; 244 Frame.Action = DELBA;
249 Frame.DelbaParm.Initiator = pInfo->Initiator; 245 Frame.DelbaParm.Initiator = pInfo->Initiator;
@@ -370,7 +366,6 @@ static VOID respond_ht_information_exchange_action(
370 366
371 NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO)); 367 NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO));
372 // 2-1. Prepare ADDBA Response frame. 368 // 2-1. Prepare ADDBA Response frame.
373#ifdef CONFIG_STA_SUPPORT
374 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 369 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
375 { 370 {
376 if (ADHOC_ON(pAd)) 371 if (ADHOC_ON(pAd))
@@ -378,7 +373,6 @@ static VOID respond_ht_information_exchange_action(
378 else 373 else
379 ActHeaderInit(pAd, &HTINFOframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr); 374 ActHeaderInit(pAd, &HTINFOframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr);
380 } 375 }
381#endif // CONFIG_STA_SUPPORT //
382 376
383 HTINFOframe.Category = CATEGORY_HT; 377 HTINFOframe.Category = CATEGORY_HT;
384 HTINFOframe.Action = HT_INFO_EXCHANGE; 378 HTINFOframe.Action = HT_INFO_EXCHANGE;
@@ -407,7 +401,7 @@ VOID PeerHTAction(
407 { 401 {
408 case NOTIFY_BW_ACTION: 402 case NOTIFY_BW_ACTION:
409 DBGPRINT(RT_DEBUG_TRACE,("ACTION - HT Notify Channel bandwidth action----> \n")); 403 DBGPRINT(RT_DEBUG_TRACE,("ACTION - HT Notify Channel bandwidth action----> \n"));
410#ifdef CONFIG_STA_SUPPORT 404
411 if(pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) 405 if(pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE)
412 { 406 {
413 // Note, this is to patch DIR-1353 AP. When the AP set to Wep, it will use legacy mode. But AP still keeps 407 // Note, this is to patch DIR-1353 AP. When the AP set to Wep, it will use legacy mode. But AP still keeps
@@ -417,7 +411,6 @@ VOID PeerHTAction(
417 Elem->Msg[LENGTH_802_11+2] )); 411 Elem->Msg[LENGTH_802_11+2] ));
418 break; 412 break;
419 } 413 }
420#endif // CONFIG_STA_SUPPORT //
421 414
422 if (Elem->Msg[LENGTH_802_11+2] == 0) // 7.4.8.2. if value is 1, keep the same as supported channel bandwidth. 415 if (Elem->Msg[LENGTH_802_11+2] == 0) // 7.4.8.2. if value is 1, keep the same as supported channel bandwidth.
423 pAd->MacTab.Content[Elem->Wcid].HTPhyMode.field.BW = 0; 416 pAd->MacTab.Content[Elem->Wcid].HTPhyMode.field.BW = 0;
@@ -546,11 +539,8 @@ VOID SendRefreshBAR(
546 539
547 Sequence = pEntry->TxSeq[TID]; 540 Sequence = pEntry->TxSeq[TID];
548 541
549
550#ifdef CONFIG_STA_SUPPORT
551 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 542 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
552 BarHeaderInit(pAd, &FrameBar, pEntry->Addr, pAd->CurrentAddress); 543 BarHeaderInit(pAd, &FrameBar, pEntry->Addr, pAd->CurrentAddress);
553#endif // CONFIG_STA_SUPPORT //
554 544
555 FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function. 545 FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function.
556 FrameBar.StartingSeq.field.StartSeq = Sequence; // make sure sequence not clear in DEL funciton. 546 FrameBar.StartingSeq.field.StartSeq = Sequence; // make sure sequence not clear in DEL funciton.
diff --git a/drivers/staging/rt3070/common/ba_action.c b/drivers/staging/rt3070/common/ba_action.c
index b312495b8d4..19cf3456e1b 100644
--- a/drivers/staging/rt3070/common/ba_action.c
+++ b/drivers/staging/rt3070/common/ba_action.c
@@ -133,10 +133,8 @@ void Announce_Reordering_Packet(IN PRTMP_ADAPTER pAd,
133 // pass this 802.3 packet to upper layer or forward this packet to WM directly 133 // pass this 802.3 packet to upper layer or forward this packet to WM directly
134 // 134 //
135 135
136#ifdef CONFIG_STA_SUPPORT
137 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 136 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
138 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket, RTMP_GET_PACKET_IF(pPacket)); 137 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket, RTMP_GET_PACKET_IF(pPacket));
139#endif // CONFIG_STA_SUPPORT //
140 } 138 }
141} 139}
142 140
@@ -603,11 +601,8 @@ VOID BAOriSessionAdd(
603 return; 601 return;
604 } 602 }
605 603
606
607#ifdef CONFIG_STA_SUPPORT
608 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 604 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
609 BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pBAEntry->Wcid].Addr, pAd->CurrentAddress); 605 BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pBAEntry->Wcid].Addr, pAd->CurrentAddress);
610#endif // CONFIG_STA_SUPPORT //
611 606
612 FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function. 607 FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function.
613 FrameBar.StartingSeq.field.StartSeq = pBAEntry->Sequence; // make sure sequence not clear in DEL funciton. 608 FrameBar.StartingSeq.field.StartSeq = pBAEntry->Sequence; // make sure sequence not clear in DEL funciton.
@@ -1072,14 +1067,12 @@ VOID BAOriSessionSetupTimeout(
1072 1067
1073 pAd = pBAEntry->pAdapter; 1068 pAd = pBAEntry->pAdapter;
1074 1069
1075#ifdef CONFIG_STA_SUPPORT
1076 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1070 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1077 { 1071 {
1078 // Do nothing if monitor mode is on 1072 // Do nothing if monitor mode is on
1079 if (MONITOR_ON(pAd)) 1073 if (MONITOR_ON(pAd))
1080 return; 1074 return;
1081 } 1075 }
1082#endif // CONFIG_STA_SUPPORT //
1083 1076
1084 pEntry = &pAd->MacTab.Content[pBAEntry->Wcid]; 1077 pEntry = &pAd->MacTab.Content[pBAEntry->Wcid];
1085 1078
@@ -1218,8 +1211,8 @@ VOID PeerAddBAReqAction(
1218 } 1211 }
1219 1212
1220 NdisZeroMemory(&ADDframe, sizeof(FRAME_ADDBA_RSP)); 1213 NdisZeroMemory(&ADDframe, sizeof(FRAME_ADDBA_RSP));
1214
1221 // 2-1. Prepare ADDBA Response frame. 1215 // 2-1. Prepare ADDBA Response frame.
1222#ifdef CONFIG_STA_SUPPORT
1223 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1216 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1224 { 1217 {
1225 if (ADHOC_ON(pAd)) 1218 if (ADHOC_ON(pAd))
@@ -1227,7 +1220,7 @@ VOID PeerAddBAReqAction(
1227 else 1220 else
1228 ActHeaderInit(pAd, &ADDframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr); 1221 ActHeaderInit(pAd, &ADDframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr);
1229 } 1222 }
1230#endif // CONFIG_STA_SUPPORT // 1223
1231 ADDframe.Category = CATEGORY_BA; 1224 ADDframe.Category = CATEGORY_BA;
1232 ADDframe.Action = ADDBA_RESP; 1225 ADDframe.Action = ADDBA_RESP;
1233 ADDframe.Token = pAddreqFrame->Token; 1226 ADDframe.Token = pAddreqFrame->Token;
@@ -1294,9 +1287,7 @@ VOID PeerAddBARspAction(
1294 } 1287 }
1295 // Rcv Decline StatusCode 1288 // Rcv Decline StatusCode
1296 if ((pFrame->StatusCode == 37) 1289 if ((pFrame->StatusCode == 37)
1297#ifdef CONFIG_STA_SUPPORT
1298 || ((pAd->OpMode == OPMODE_STA) && STA_TGN_WIFI_ON(pAd) && (pFrame->StatusCode != 0)) 1290 || ((pAd->OpMode == OPMODE_STA) && STA_TGN_WIFI_ON(pAd) && (pFrame->StatusCode != 0))
1299#endif // CONFIG_STA_SUPPORT //
1300 ) 1291 )
1301 { 1292 {
1302 pAd->MacTab.Content[Elem->Wcid].BADeclineBitmap |= 1<<pFrame->BaParm.TID; 1293 pAd->MacTab.Content[Elem->Wcid].BADeclineBitmap |= 1<<pFrame->BaParm.TID;
@@ -1421,10 +1412,9 @@ VOID SendPSMPAction(
1421 DBGPRINT(RT_DEBUG_ERROR,("BA - MlmeADDBAAction() allocate memory failed \n")); 1412 DBGPRINT(RT_DEBUG_ERROR,("BA - MlmeADDBAAction() allocate memory failed \n"));
1422 return; 1413 return;
1423 } 1414 }
1424#ifdef CONFIG_STA_SUPPORT 1415
1425 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1416 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1426 ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[Wcid].Addr); 1417 ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[Wcid].Addr);
1427#endif // CONFIG_STA_SUPPORT //
1428 1418
1429 Frame.Category = CATEGORY_HT; 1419 Frame.Category = CATEGORY_HT;
1430 Frame.Action = SMPS_ACTION; 1420 Frame.Action = SMPS_ACTION;
@@ -1531,10 +1521,8 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(
1531 // a. pointer pRxBlk->pData to payload 1521 // a. pointer pRxBlk->pData to payload
1532 // b. modify pRxBlk->DataSize 1522 // b. modify pRxBlk->DataSize
1533 1523
1534#ifdef CONFIG_STA_SUPPORT
1535 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1524 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1536 RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3); 1525 RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
1537#endif // CONFIG_STA_SUPPORT //
1538 1526
1539 ASSERT(pRxBlk->pRxPacket); 1527 ASSERT(pRxBlk->pRxPacket);
1540 pRxPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket); 1528 pRxPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket);
@@ -1549,15 +1537,12 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(
1549 // 1537 //
1550 if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU)) 1538 if (!RX_BLK_TEST_FLAG(pRxBlk, fRX_AMSDU))
1551 { 1539 {
1552
1553#ifdef CONFIG_STA_SUPPORT
1554 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1540 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1555 { 1541 {
1556#ifdef LINUX 1542#ifdef LINUX
1557 NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3); 1543 NdisMoveMemory(skb_push(pRxPkt, LENGTH_802_3), Header802_3, LENGTH_802_3);
1558#endif 1544#endif
1559 } 1545 }
1560#endif // CONFIG_STA_SUPPORT //
1561 } 1546 }
1562} 1547}
1563 1548
diff --git a/drivers/staging/rt3070/common/cmm_data.c b/drivers/staging/rt3070/common/cmm_data.c
index 79828ec2fa0..190fe59b40b 100644
--- a/drivers/staging/rt3070/common/cmm_data.c
+++ b/drivers/staging/rt3070/common/cmm_data.c
@@ -377,14 +377,12 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
377 return NDIS_STATUS_FAILURE; 377 return NDIS_STATUS_FAILURE;
378 } 378 }
379 379
380#ifdef CONFIG_STA_SUPPORT
381 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 380 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
382 { 381 {
383 // outgoing frame always wakeup PHY to prevent frame lost 382 // outgoing frame always wakeup PHY to prevent frame lost
384 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)) 383 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))
385 AsicForceWakeup(pAd, TRUE); 384 AsicForceWakeup(pAd, TRUE);
386 } 385 }
387#endif // CONFIG_STA_SUPPORT //
388 386
389 pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA + TXINFO_SIZE); 387 pFirstTxWI = (PTXWI_STRUC)(pSrcBufVA + TXINFO_SIZE);
390 pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); //TXWI_SIZE); 388 pHeader_802_11 = (PHEADER_802_11) (pSrcBufVA + TXINFO_SIZE + TXWI_SIZE); //TXWI_SIZE);
@@ -408,7 +406,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
408 pMacEntry = MacTableLookup(pAd, pHeader_802_11->Addr1); 406 pMacEntry = MacTableLookup(pAd, pHeader_802_11->Addr1);
409 } 407 }
410 408
411#ifdef CONFIG_STA_SUPPORT
412 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 409 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
413 { 410 {
414 // Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode. 411 // Fixed W52 with Activity scan issue in ABG_MIXED and ABGN_MIXED mode.
@@ -424,7 +421,6 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
424 pAd->CommonCfg.MlmeTransmit.field.MODE = 0; 421 pAd->CommonCfg.MlmeTransmit.field.MODE = 0;
425 } 422 }
426 } 423 }
427#endif // CONFIG_STA_SUPPORT //
428 424
429 // 425 //
430 // Should not be hard code to set PwrMgmt to 0 (PWR_ACTIVE) 426 // Should not be hard code to set PwrMgmt to 0 (PWR_ACTIVE)
@@ -434,7 +430,7 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
434 // pHeader_802_11->FC.PwrMgmt = 0; // (pAd->StaCfg.Psm == PWR_SAVE); 430 // pHeader_802_11->FC.PwrMgmt = 0; // (pAd->StaCfg.Psm == PWR_SAVE);
435 // 431 //
436 // In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame 432 // In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame
437#ifdef CONFIG_STA_SUPPORT 433
438 // Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD 434 // Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD
439 if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL)) 435 if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL))
440 { 436 {
@@ -444,18 +440,15 @@ NDIS_STATUS MlmeHardTransmitMgmtRing(
444 else 440 else
445 pHeader_802_11->FC.PwrMgmt = PWR_ACTIVE; 441 pHeader_802_11->FC.PwrMgmt = PWR_ACTIVE;
446 } 442 }
447#endif // CONFIG_STA_SUPPORT //
448 443
449 bInsertTimestamp = FALSE; 444 bInsertTimestamp = FALSE;
450 if (pHeader_802_11->FC.Type == BTYPE_CNTL) // must be PS-POLL 445 if (pHeader_802_11->FC.Type == BTYPE_CNTL) // must be PS-POLL
451 { 446 {
452#ifdef CONFIG_STA_SUPPORT
453 //Set PM bit in ps-poll, to fix WLK 1.2 PowerSaveMode_ext failure issue. 447 //Set PM bit in ps-poll, to fix WLK 1.2 PowerSaveMode_ext failure issue.
454 if ((pAd->OpMode == OPMODE_STA) && (pHeader_802_11->FC.SubType == SUBTYPE_PS_POLL)) 448 if ((pAd->OpMode == OPMODE_STA) && (pHeader_802_11->FC.SubType == SUBTYPE_PS_POLL))
455 { 449 {
456 pHeader_802_11->FC.PwrMgmt = PWR_SAVE; 450 pHeader_802_11->FC.PwrMgmt = PWR_SAVE;
457 } 451 }
458#endif // CONFIG_STA_SUPPORT //
459 bAckRequired = FALSE; 452 bAckRequired = FALSE;
460 } 453 }
461 else // BTYPE_MGMT or BTYPE_DATA(must be NULL frame) 454 else // BTYPE_MGMT or BTYPE_DATA(must be NULL frame)
@@ -725,8 +718,6 @@ BOOLEAN RTMP_FillTxBlkInfo(
725 TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired); 718 TX_BLK_SET_FLAG(pTxBlk, fTX_bAckRequired);
726 719
727 { 720 {
728
729#ifdef CONFIG_STA_SUPPORT
730 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 721 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
731 { 722 {
732 723
@@ -738,7 +729,6 @@ BOOLEAN RTMP_FillTxBlkInfo(
738// if (pAd->StaCfg.bAutoTxRateSwitch) 729// if (pAd->StaCfg.bAutoTxRateSwitch)
739// TX_BLK_SET_FLAG(pTxBlk, fTX_AutoRateSwitch); 730// TX_BLK_SET_FLAG(pTxBlk, fTX_AutoRateSwitch);
740 } 731 }
741#endif // CONFIG_STA_SUPPORT //
742 } 732 }
743 733
744 if (pTxBlk->TxFrameType == TX_LEGACY_FRAME) 734 if (pTxBlk->TxFrameType == TX_LEGACY_FRAME)
@@ -821,13 +811,10 @@ BOOLEAN CanDoAggregateTransmit(
821 return FALSE; 811 return FALSE;
822 } 812 }
823 813
824#ifdef CONFIG_STA_SUPPORT
825 if ((INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA)) // must be unicast to AP 814 if ((INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA)) // must be unicast to AP
826 return TRUE; 815 return TRUE;
827 else 816 else
828#endif // CONFIG_STA_SUPPORT //
829 return FALSE; 817 return FALSE;
830
831} 818}
832 819
833 820
@@ -881,10 +868,8 @@ VOID RTMPDeQueuePacket(
881 { 868 {
882 sQIdx = 0; 869 sQIdx = 0;
883//PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) 870//PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
884#ifdef CONFIG_STA_SUPPORT
885 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 871 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
886 eQIdx = 3; // 4 ACs, start from 0. 872 eQIdx = 3; // 4 ACs, start from 0.
887#endif // CONFIG_STA_SUPPORT //
888 } 873 }
889 else 874 else
890 { 875 {
@@ -1004,10 +989,8 @@ VOID RTMPDeQueuePacket(
1004 Count += pTxBlk->TxPacketList.Number; 989 Count += pTxBlk->TxPacketList.Number;
1005 990
1006 // Do HardTransmit now. 991 // Do HardTransmit now.
1007#ifdef CONFIG_STA_SUPPORT
1008 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 992 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1009 Status = STAHardTransmit(pAd, pTxBlk, QueIdx); 993 Status = STAHardTransmit(pAd, pTxBlk, QueIdx);
1010#endif // CONFIG_STA_SUPPORT //
1011 } 994 }
1012 995
1013 RT28XX_STOP_DEQUEUE(pAd, QueIdx, IrqFlags); 996 RT28XX_STOP_DEQUEUE(pAd, QueIdx, IrqFlags);
@@ -1693,7 +1676,6 @@ UINT deaggregate_AMSDU_announce(
1693 // convert to 802.3 header 1676 // convert to 802.3 header
1694 CONVERT_TO_802_3(Header802_3, pDA, pSA, pPayload, PayloadSize, pRemovedLLCSNAP); 1677 CONVERT_TO_802_3(Header802_3, pDA, pSA, pPayload, PayloadSize, pRemovedLLCSNAP);
1695 1678
1696#ifdef CONFIG_STA_SUPPORT
1697 if ((Header802_3[12] == 0x88) && (Header802_3[13] == 0x8E) ) 1679 if ((Header802_3[12] == 0x88) && (Header802_3[13] == 0x8E) )
1698 { 1680 {
1699 // avoid local heap overflow, use dyanamic allocation 1681 // avoid local heap overflow, use dyanamic allocation
@@ -1703,9 +1685,7 @@ UINT deaggregate_AMSDU_announce(
1703 WpaEAPOLKeyAction(pAd, Elem); 1685 WpaEAPOLKeyAction(pAd, Elem);
1704 kfree(Elem); 1686 kfree(Elem);
1705 } 1687 }
1706#endif // CONFIG_STA_SUPPORT //
1707 1688
1708#ifdef CONFIG_STA_SUPPORT
1709 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1689 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1710 { 1690 {
1711 if (pRemovedLLCSNAP) 1691 if (pRemovedLLCSNAP)
@@ -1715,15 +1695,12 @@ UINT deaggregate_AMSDU_announce(
1715 NdisMoveMemory(pPayload, &Header802_3[0], LENGTH_802_3); 1695 NdisMoveMemory(pPayload, &Header802_3[0], LENGTH_802_3);
1716 } 1696 }
1717 } 1697 }
1718#endif // CONFIG_STA_SUPPORT //
1719 1698
1720 pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize); 1699 pClonePacket = ClonePacket(pAd, pPacket, pPayload, PayloadSize);
1721 if (pClonePacket) 1700 if (pClonePacket)
1722 { 1701 {
1723#ifdef CONFIG_STA_SUPPORT
1724 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1702 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1725 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket)); 1703 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pClonePacket, RTMP_GET_PACKET_IF(pPacket));
1726#endif // CONFIG_STA_SUPPORT //
1727 } 1704 }
1728 1705
1729 1706
@@ -1821,11 +1798,11 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
1821 return NULL; 1798 return NULL;
1822 1799
1823 FirstWcid = 1; 1800 FirstWcid = 1;
1824#ifdef CONFIG_STA_SUPPORT 1801
1825 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1802 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1803
1826 if (pAd->StaCfg.BssType == BSS_INFRA) 1804 if (pAd->StaCfg.BssType == BSS_INFRA)
1827 FirstWcid = 2; 1805 FirstWcid = 2;
1828#endif // CONFIG_STA_SUPPORT //
1829 1806
1830 // allocate one MAC entry 1807 // allocate one MAC entry
1831 NdisAcquireSpinLock(&pAd->MacTabLock); 1808 NdisAcquireSpinLock(&pAd->MacTabLock);
@@ -1848,8 +1825,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
1848 pEntry->PairwiseKey.CipherAlg = CIPHER_NONE; 1825 pEntry->PairwiseKey.CipherAlg = CIPHER_NONE;
1849 } 1826 }
1850 { 1827 {
1851
1852#ifdef CONFIG_STA_SUPPORT
1853 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1828 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1854 { 1829 {
1855 pEntry->ValidAsCLI = TRUE; 1830 pEntry->ValidAsCLI = TRUE;
@@ -1858,7 +1833,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
1858 pEntry->ValidAsMesh = FALSE; 1833 pEntry->ValidAsMesh = FALSE;
1859 pEntry->ValidAsDls = FALSE; 1834 pEntry->ValidAsDls = FALSE;
1860 } 1835 }
1861#endif // CONFIG_STA_SUPPORT //
1862 } 1836 }
1863 1837
1864 pEntry->bIAmBadAtheros = FALSE; 1838 pEntry->bIAmBadAtheros = FALSE;
@@ -1879,15 +1853,12 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
1879 pEntry->apidx = apidx; 1853 pEntry->apidx = apidx;
1880 1854
1881 { 1855 {
1882
1883#ifdef CONFIG_STA_SUPPORT
1884 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1856 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1885 { 1857 {
1886 pEntry->AuthMode = pAd->StaCfg.AuthMode; 1858 pEntry->AuthMode = pAd->StaCfg.AuthMode;
1887 pEntry->WepStatus = pAd->StaCfg.WepStatus; 1859 pEntry->WepStatus = pAd->StaCfg.WepStatus;
1888 pEntry->PrivacyFilter = Ndis802_11PrivFilterAcceptAll; 1860 pEntry->PrivacyFilter = Ndis802_11PrivFilterAcceptAll;
1889 } 1861 }
1890#endif // CONFIG_STA_SUPPORT //
1891 } 1862 }
1892 1863
1893 pEntry->GTKState = REKEY_NEGOTIATING; 1864 pEntry->GTKState = REKEY_NEGOTIATING;
@@ -2376,10 +2347,8 @@ VOID Indicate_Legacy_Packet(
2376 // 2. remove LLC 2347 // 2. remove LLC
2377 // a. pointer pRxBlk->pData to payload 2348 // a. pointer pRxBlk->pData to payload
2378 // b. modify pRxBlk->DataSize 2349 // b. modify pRxBlk->DataSize
2379#ifdef CONFIG_STA_SUPPORT
2380 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2350 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2381 RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3); 2351 RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
2382#endif // CONFIG_STA_SUPPORT //
2383 2352
2384 if (pRxBlk->DataSize > MAX_RX_PKT_LEN) 2353 if (pRxBlk->DataSize > MAX_RX_PKT_LEN)
2385 { 2354 {
@@ -2430,11 +2399,8 @@ VOID Indicate_Legacy_Packet(
2430 // 2399 //
2431 // pass this 802.3 packet to upper layer or forward this packet to WM directly 2400 // pass this 802.3 packet to upper layer or forward this packet to WM directly
2432 // 2401 //
2433#ifdef CONFIG_STA_SUPPORT
2434 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2402 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2435 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID); 2403 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxPacket, FromWhichBSSID);
2436#endif // CONFIG_STA_SUPPORT //
2437
2438} 2404}
2439 2405
2440 2406
@@ -2497,11 +2463,8 @@ VOID CmmRxRalinkFrameIndicate(
2497 } 2463 }
2498 2464
2499 // get 802.3 Header and remove LLC 2465 // get 802.3 Header and remove LLC
2500#ifdef CONFIG_STA_SUPPORT
2501 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2466 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2502 RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3); 2467 RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(pRxBlk, Header802_3);
2503#endif // CONFIG_STA_SUPPORT //
2504
2505 2468
2506 ASSERT(pRxBlk->pRxPacket); 2469 ASSERT(pRxBlk->pRxPacket);
2507 2470
@@ -2511,10 +2474,9 @@ VOID CmmRxRalinkFrameIndicate(
2511 Payload2Size = Msdu2Size - LENGTH_802_3; 2474 Payload2Size = Msdu2Size - LENGTH_802_3;
2512 2475
2513 pData2 = pRxBlk->pData + Payload1Size + LENGTH_802_3; 2476 pData2 = pRxBlk->pData + Payload1Size + LENGTH_802_3;
2514#ifdef CONFIG_STA_SUPPORT 2477
2515 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2478 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2516 pPacket2 = duplicate_pkt(pAd, (pData2-LENGTH_802_3), LENGTH_802_3, pData2, Payload2Size, FromWhichBSSID); 2479 pPacket2 = duplicate_pkt(pAd, (pData2-LENGTH_802_3), LENGTH_802_3, pData2, Payload2Size, FromWhichBSSID);
2517#endif // CONFIG_STA_SUPPORT //
2518 2480
2519 if (!pPacket2) 2481 if (!pPacket2)
2520 { 2482 {
@@ -2527,17 +2489,13 @@ VOID CmmRxRalinkFrameIndicate(
2527 pRxBlk->DataSize = Payload1Size; 2489 pRxBlk->DataSize = Payload1Size;
2528 wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID); 2490 wlan_802_11_to_802_3_packet(pAd, pRxBlk, Header802_3, FromWhichBSSID);
2529 2491
2530#ifdef CONFIG_STA_SUPPORT
2531 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2492 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2532 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxBlk->pRxPacket, FromWhichBSSID); 2493 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pRxBlk->pRxPacket, FromWhichBSSID);
2533#endif // CONFIG_STA_SUPPORT //
2534 2494
2535 if (pPacket2) 2495 if (pPacket2)
2536 { 2496 {
2537#ifdef CONFIG_STA_SUPPORT
2538 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2497 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2539 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID); 2498 ANNOUNCE_OR_FORWARD_802_3_PACKET(pAd, pPacket2, FromWhichBSSID);
2540#endif // CONFIG_STA_SUPPORT //
2541 } 2499 }
2542} 2500}
2543 2501
@@ -2680,15 +2638,12 @@ VOID Indicate_EAPOL_Packet(
2680{ 2638{
2681 MAC_TABLE_ENTRY *pEntry = NULL; 2639 MAC_TABLE_ENTRY *pEntry = NULL;
2682 2640
2683
2684#ifdef CONFIG_STA_SUPPORT
2685 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2641 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2686 { 2642 {
2687 pEntry = &pAd->MacTab.Content[BSSID_WCID]; 2643 pEntry = &pAd->MacTab.Content[BSSID_WCID];
2688 STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID); 2644 STARxEAPOLFrameIndicate(pAd, pEntry, pRxBlk, FromWhichBSSID);
2689 return; 2645 return;
2690 } 2646 }
2691#endif // CONFIG_STA_SUPPORT //
2692 2647
2693 if (pEntry == NULL) 2648 if (pEntry == NULL)
2694 { 2649 {
diff --git a/drivers/staging/rt3070/common/cmm_data_2870.c b/drivers/staging/rt3070/common/cmm_data_2870.c
index 6866caa37ac..3fc0fce2998 100644
--- a/drivers/staging/rt3070/common/cmm_data_2870.c
+++ b/drivers/staging/rt3070/common/cmm_data_2870.c
@@ -293,10 +293,8 @@ USHORT RtmpUSB_WriteSingleTxResource(
293 293
294 // For TxInfo, the length of USBDMApktLen = TXWI_SIZE + 802.11 header + payload 294 // For TxInfo, the length of USBDMApktLen = TXWI_SIZE + 802.11 header + payload
295 //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) 295 //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
296#ifdef CONFIG_STA_SUPPORT
297 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 296 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
298 RTMPWriteTxInfo(pAd, pTxInfo, (USHORT)(USBDMApktLen), FALSE, FIFO_EDCA, FALSE /*NextValid*/, FALSE); 297 RTMPWriteTxInfo(pAd, pTxInfo, (USHORT)(USBDMApktLen), FALSE, FIFO_EDCA, FALSE /*NextValid*/, FALSE);
299#endif // CONFIG_STA_SUPPORT //
300 298
301 if ((pHTTXContext->CurWritePosition + 3906 + pTxBlk->Priv) > MAX_TXBULK_LIMIT) 299 if ((pHTTXContext->CurWritePosition + 3906 + pTxBlk->Priv) > MAX_TXBULK_LIMIT)
302 { 300 {
@@ -696,7 +694,6 @@ VOID RtmpUSBNullFrameKickOut(
696 694
697} 695}
698 696
699#ifdef CONFIG_STA_SUPPORT
700/* 697/*
701 ======================================================================== 698 ========================================================================
702 699
@@ -842,7 +839,6 @@ VOID RT28xxUsbStaAsicSleepThenAutoWakeup(
842 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_DOZE); 839 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_DOZE);
843 840
844} 841}
845#endif // CONFIG_STA_SUPPORT //
846 842
847VOID RT28xxUsbMlmeRadioOn( 843VOID RT28xxUsbMlmeRadioOn(
848 IN PRTMP_ADAPTER pAd) 844 IN PRTMP_ADAPTER pAd)
@@ -852,13 +848,12 @@ VOID RT28xxUsbMlmeRadioOn(
852 if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF)) 848 if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF))
853 return; 849 return;
854 850
855#ifdef CONFIG_STA_SUPPORT
856 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 851 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
857 { 852 {
858 AsicSendCommandToMcu(pAd, 0x31, 0xff, 0x00, 0x02); 853 AsicSendCommandToMcu(pAd, 0x31, 0xff, 0x00, 0x02);
859 RTMPusecDelay(10000); 854 RTMPusecDelay(10000);
860 } 855 }
861#endif // CONFIG_STA_SUPPORT // 856
862 NICResetFromError(pAd); 857 NICResetFromError(pAd);
863 858
864 // Enable Tx/Rx 859 // Enable Tx/Rx
@@ -874,10 +869,8 @@ VOID RT28xxUsbMlmeRadioOn(
874 // Clear Radio off flag 869 // Clear Radio off flag
875 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF); 870 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF);
876 871
877#ifdef CONFIG_STA_SUPPORT
878 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 872 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
879 RTUSBBulkReceive(pAd); 873 RTUSBBulkReceive(pAd);
880#endif // CONFIG_STA_SUPPORT //
881 874
882 // Set LED 875 // Set LED
883 RTMPSetLED(pAd, LED_RADIO_ON); 876 RTMPSetLED(pAd, LED_RADIO_ON);
@@ -899,7 +892,6 @@ VOID RT28xxUsbMlmeRadioOFF(
899 // Set Radio off flag 892 // Set Radio off flag
900 RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF); 893 RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF);
901 894
902#ifdef CONFIG_STA_SUPPORT
903 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 895 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
904 { 896 {
905 // Link down first if any association exists 897 // Link down first if any association exists
@@ -911,8 +903,6 @@ VOID RT28xxUsbMlmeRadioOFF(
911 // Clean up old bss table 903 // Clean up old bss table
912 BssTableInit(&pAd->ScanTab); 904 BssTableInit(&pAd->ScanTab);
913 } 905 }
914#endif // CONFIG_STA_SUPPORT //
915
916 906
917 if (pAd->CommonCfg.BBPCurrentBW == BW_40) 907 if (pAd->CommonCfg.BBPCurrentBW == BW_40)
918 { 908 {
@@ -956,9 +946,7 @@ VOID RT28xxUsbMlmeRadioOFF(
956 // TX_PIN_CFG => value = 0x0 => 20mA 946 // TX_PIN_CFG => value = 0x0 => 20mA
957 //RTMP_IO_WRITE32(pAd, TX_PIN_CFG, 0); 947 //RTMP_IO_WRITE32(pAd, TX_PIN_CFG, 0);
958 948
959#ifdef CONFIG_STA_SUPPORT
960 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 949 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
961 AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x02); 950 AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x02);
962#endif // CONFIG_STA_SUPPORT //
963} 951}
964 952
diff --git a/drivers/staging/rt3070/common/cmm_info.c b/drivers/staging/rt3070/common/cmm_info.c
index 6cd2f5682c6..6106fe97fee 100644
--- a/drivers/staging/rt3070/common/cmm_info.c
+++ b/drivers/staging/rt3070/common/cmm_info.c
@@ -133,11 +133,9 @@ INT Show_IEEE80211H_Proc(
133 IN PRTMP_ADAPTER pAd, 133 IN PRTMP_ADAPTER pAd,
134 OUT PUCHAR pBuf); 134 OUT PUCHAR pBuf);
135 135
136#ifdef CONFIG_STA_SUPPORT
137INT Show_NetworkType_Proc( 136INT Show_NetworkType_Proc(
138 IN PRTMP_ADAPTER pAd, 137 IN PRTMP_ADAPTER pAd,
139 OUT PUCHAR pBuf); 138 OUT PUCHAR pBuf);
140#endif // CONFIG_STA_SUPPORT //
141 139
142INT Show_AuthMode_Proc( 140INT Show_AuthMode_Proc(
143 IN PRTMP_ADAPTER pAd, 141 IN PRTMP_ADAPTER pAd,
@@ -207,9 +205,7 @@ static struct {
207 {"WmmCapable", Show_WmmCapable_Proc}, 205 {"WmmCapable", Show_WmmCapable_Proc},
208#endif 206#endif
209 {"IEEE80211H", Show_IEEE80211H_Proc}, 207 {"IEEE80211H", Show_IEEE80211H_Proc},
210#ifdef CONFIG_STA_SUPPORT
211 {"NetworkType", Show_NetworkType_Proc}, 208 {"NetworkType", Show_NetworkType_Proc},
212#endif // CONFIG_STA_SUPPORT //
213 {"AuthMode", Show_AuthMode_Proc}, 209 {"AuthMode", Show_AuthMode_Proc},
214 {"EncrypType", Show_EncrypType_Proc}, 210 {"EncrypType", Show_EncrypType_Proc},
215 {"DefaultKeyID", Show_DefaultKeyID_Proc}, 211 {"DefaultKeyID", Show_DefaultKeyID_Proc},
@@ -233,11 +229,8 @@ INT Set_DriverVersion_Proc(
233 IN PRTMP_ADAPTER pAd, 229 IN PRTMP_ADAPTER pAd,
234 IN PUCHAR arg) 230 IN PUCHAR arg)
235{ 231{
236
237#ifdef CONFIG_STA_SUPPORT
238 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 232 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
239 DBGPRINT(RT_DEBUG_TRACE, ("Driver version-%s\n", STA_DRIVER_VERSION)); 233 DBGPRINT(RT_DEBUG_TRACE, ("Driver version-%s\n", STA_DRIVER_VERSION));
240#endif // CONFIG_STA_SUPPORT //
241 234
242 return TRUE; 235 return TRUE;
243} 236}
@@ -347,8 +340,6 @@ INT Set_WirelessMode_Proc(
347 340
348 WirelessMode = simple_strtol(arg, 0, 10); 341 WirelessMode = simple_strtol(arg, 0, 10);
349 342
350
351#ifdef CONFIG_STA_SUPPORT
352 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 343 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
353 { 344 {
354 INT MaxPhyMode = PHY_11G; 345 INT MaxPhyMode = PHY_11G;
@@ -385,7 +376,6 @@ INT Set_WirelessMode_Proc(
385 success = FALSE; 376 success = FALSE;
386 } 377 }
387 } 378 }
388#endif // CONFIG_STA_SUPPORT //
389 379
390 // it is needed to set SSID to take effect 380 // it is needed to set SSID to take effect
391 if (success == TRUE) 381 if (success == TRUE)
@@ -423,7 +413,6 @@ INT Set_Channel_Proc(
423 // check if this channel is valid 413 // check if this channel is valid
424 if (ChannelSanity(pAd, Channel) == TRUE) 414 if (ChannelSanity(pAd, Channel) == TRUE)
425 { 415 {
426#ifdef CONFIG_STA_SUPPORT
427 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 416 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
428 { 417 {
429 pAd->CommonCfg.Channel = Channel; 418 pAd->CommonCfg.Channel = Channel;
@@ -450,16 +439,12 @@ INT Set_Channel_Proc(
450 } 439 }
451 } 440 }
452 } 441 }
453#endif // CONFIG_STA_SUPPORT //
454 success = TRUE; 442 success = TRUE;
455 } 443 }
456 else 444 else
457 { 445 {
458
459#ifdef CONFIG_STA_SUPPORT
460 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 446 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
461 success = FALSE; 447 success = FALSE;
462#endif // CONFIG_STA_SUPPORT //
463 } 448 }
464 449
465 450
@@ -515,14 +500,11 @@ INT Set_TxPower_Proc(
515 TxPower = (ULONG) simple_strtol(arg, 0, 10); 500 TxPower = (ULONG) simple_strtol(arg, 0, 10);
516 if (TxPower <= 100) 501 if (TxPower <= 100)
517 { 502 {
518
519#ifdef CONFIG_STA_SUPPORT
520 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 503 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
521 { 504 {
522 pAd->CommonCfg.TxPowerDefault = TxPower; 505 pAd->CommonCfg.TxPowerDefault = TxPower;
523 pAd->CommonCfg.TxPowerPercentage = pAd->CommonCfg.TxPowerDefault; 506 pAd->CommonCfg.TxPowerPercentage = pAd->CommonCfg.TxPowerDefault;
524 } 507 }
525#endif // CONFIG_STA_SUPPORT //
526 success = TRUE; 508 success = TRUE;
527 } 509 }
528 else 510 else
@@ -587,22 +569,18 @@ INT Set_TxPreamble_Proc(
587 { 569 {
588 case Rt802_11PreambleShort: 570 case Rt802_11PreambleShort:
589 pAd->CommonCfg.TxPreamble = Preamble; 571 pAd->CommonCfg.TxPreamble = Preamble;
590#ifdef CONFIG_STA_SUPPORT 572
591 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 573 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
592 MlmeSetTxPreamble(pAd, Rt802_11PreambleShort); 574 MlmeSetTxPreamble(pAd, Rt802_11PreambleShort);
593#endif // CONFIG_STA_SUPPORT //
594 break; 575 break;
595 case Rt802_11PreambleLong: 576 case Rt802_11PreambleLong:
596#ifdef CONFIG_STA_SUPPORT
597 case Rt802_11PreambleAuto: 577 case Rt802_11PreambleAuto:
598 // if user wants AUTO, initialize to LONG here, then change according to AP's 578 // if user wants AUTO, initialize to LONG here, then change according to AP's
599 // capability upon association. 579 // capability upon association.
600#endif // CONFIG_STA_SUPPORT //
601 pAd->CommonCfg.TxPreamble = Preamble; 580 pAd->CommonCfg.TxPreamble = Preamble;
602#ifdef CONFIG_STA_SUPPORT 581
603 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 582 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
604 MlmeSetTxPreamble(pAd, Rt802_11PreambleLong); 583 MlmeSetTxPreamble(pAd, Rt802_11PreambleLong);
605#endif // CONFIG_STA_SUPPORT //
606 break; 584 break;
607 default: //Invalid argument 585 default: //Invalid argument
608 return FALSE; 586 return FALSE;
@@ -631,10 +609,8 @@ INT Set_RTSThreshold_Proc(
631 609
632 if((RtsThresh > 0) && (RtsThresh <= MAX_RTS_THRESHOLD)) 610 if((RtsThresh > 0) && (RtsThresh <= MAX_RTS_THRESHOLD))
633 pAd->CommonCfg.RtsThreshold = (USHORT)RtsThresh; 611 pAd->CommonCfg.RtsThreshold = (USHORT)RtsThresh;
634#ifdef CONFIG_STA_SUPPORT
635 else if (RtsThresh == 0) 612 else if (RtsThresh == 0)
636 pAd->CommonCfg.RtsThreshold = MAX_RTS_THRESHOLD; 613 pAd->CommonCfg.RtsThreshold = MAX_RTS_THRESHOLD;
637#endif // CONFIG_STA_SUPPORT //
638 else 614 else
639 return FALSE; //Invalid argument 615 return FALSE; //Invalid argument
640 616
@@ -675,7 +651,6 @@ INT Set_FragThreshold_Proc(
675 pAd->CommonCfg.FragmentThreshold = (USHORT)FragThresh; 651 pAd->CommonCfg.FragmentThreshold = (USHORT)FragThresh;
676 } 652 }
677 653
678#ifdef CONFIG_STA_SUPPORT
679 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 654 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
680 { 655 {
681 if (pAd->CommonCfg.FragmentThreshold == MAX_FRAG_THRESHOLD) 656 if (pAd->CommonCfg.FragmentThreshold == MAX_FRAG_THRESHOLD)
@@ -683,7 +658,6 @@ INT Set_FragThreshold_Proc(
683 else 658 else
684 pAd->CommonCfg.bUseZeroToDisableFragment = FALSE; 659 pAd->CommonCfg.bUseZeroToDisableFragment = FALSE;
685 } 660 }
686#endif // CONFIG_STA_SUPPORT //
687 661
688 DBGPRINT(RT_DEBUG_TRACE, ("Set_FragThreshold_Proc::(FragThreshold=%d)\n", pAd->CommonCfg.FragmentThreshold)); 662 DBGPRINT(RT_DEBUG_TRACE, ("Set_FragThreshold_Proc::(FragThreshold=%d)\n", pAd->CommonCfg.FragmentThreshold));
689 663
@@ -877,7 +851,6 @@ BOOLEAN RTMPCheckStrPrintAble(
877 851
878 ======================================================================== 852 ========================================================================
879*/ 853*/
880#ifdef CONFIG_STA_SUPPORT
881VOID RTMPSetDesiredRates( 854VOID RTMPSetDesiredRates(
882 IN PRTMP_ADAPTER pAdapter, 855 IN PRTMP_ADAPTER pAdapter,
883 IN LONG Rates) 856 IN LONG Rates)
@@ -1090,10 +1063,7 @@ NDIS_STATUS RTMPWPARemoveKeyProc(
1090 1063
1091 return (Status); 1064 return (Status);
1092} 1065}
1093#endif // CONFIG_STA_SUPPORT //
1094 1066
1095
1096#ifdef CONFIG_STA_SUPPORT
1097/* 1067/*
1098 ======================================================================== 1068 ========================================================================
1099 1069
@@ -1143,7 +1113,6 @@ VOID RTMPWPARemoveAllKeys(
1143 } 1113 }
1144 1114
1145} 1115}
1146#endif // CONFIG_STA_SUPPORT //
1147 1116
1148/* 1117/*
1149 ======================================================================== 1118 ========================================================================
@@ -1182,10 +1151,8 @@ VOID RTMPSetPhyMode(
1182 1151
1183 if (i == pAd->ChannelListNum) 1152 if (i == pAd->ChannelListNum)
1184 { 1153 {
1185#ifdef CONFIG_STA_SUPPORT
1186 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1154 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1187 pAd->CommonCfg.Channel = FirstChannel(pAd); 1155 pAd->CommonCfg.Channel = FirstChannel(pAd);
1188#endif // CONFIG_STA_SUPPORT //
1189 DBGPRINT(RT_DEBUG_ERROR, ("RTMPSetPhyMode: channel is out of range, use first channel=%d \n", pAd->CommonCfg.Channel)); 1156 DBGPRINT(RT_DEBUG_ERROR, ("RTMPSetPhyMode: channel is out of range, use first channel=%d \n", pAd->CommonCfg.Channel));
1190 } 1157 }
1191 1158
@@ -1495,14 +1462,10 @@ VOID RTMPSetHT(
1495 } 1462 }
1496 AsicSetEdcaParm(pAd, &pAd->CommonCfg.APEdcaParm); 1463 AsicSetEdcaParm(pAd, &pAd->CommonCfg.APEdcaParm);
1497 1464
1498
1499#ifdef CONFIG_STA_SUPPORT
1500 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1465 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1501 { 1466 {
1502 RTMPSetIndividualHT(pAd, 0); 1467 RTMPSetIndividualHT(pAd, 0);
1503 } 1468 }
1504#endif // CONFIG_STA_SUPPORT //
1505
1506} 1469}
1507 1470
1508/* 1471/*
@@ -1527,8 +1490,6 @@ VOID RTMPSetIndividualHT(
1527 1490
1528 do 1491 do
1529 { 1492 {
1530
1531#ifdef CONFIG_STA_SUPPORT
1532 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1493 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1533 { 1494 {
1534 pDesired_ht_phy = &pAd->StaCfg.DesiredHtPhyInfo; 1495 pDesired_ht_phy = &pAd->StaCfg.DesiredHtPhyInfo;
@@ -1536,7 +1497,6 @@ VOID RTMPSetIndividualHT(
1536 //pAd->StaCfg.bAutoTxRateSwitch = (DesiredMcs == MCS_AUTO) ? TRUE : FALSE; 1497 //pAd->StaCfg.bAutoTxRateSwitch = (DesiredMcs == MCS_AUTO) ? TRUE : FALSE;
1537 break; 1498 break;
1538 } 1499 }
1539#endif // CONFIG_STA_SUPPORT //
1540 } while (FALSE); 1500 } while (FALSE);
1541 1501
1542 if (pDesired_ht_phy == NULL) 1502 if (pDesired_ht_phy == NULL)
@@ -1688,7 +1648,6 @@ VOID RTMPAddWcidAttributeEntry(
1688 USHORT Wcid = 0; 1648 USHORT Wcid = 0;
1689 1649
1690 { 1650 {
1691#ifdef CONFIG_STA_SUPPORT
1692 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1651 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1693 { 1652 {
1694 if (BssIdx > BSS0) 1653 if (BssIdx > BSS0)
@@ -1709,13 +1668,11 @@ VOID RTMPAddWcidAttributeEntry(
1709 else 1668 else
1710 Wcid = MCAST_WCID; 1669 Wcid = MCAST_WCID;
1711 } 1670 }
1712#endif // CONFIG_STA_SUPPORT //
1713 } 1671 }
1714 1672
1715 // Update WCID attribute table 1673 // Update WCID attribute table
1716 offset = MAC_WCID_ATTRIBUTE_BASE + (Wcid * HW_WCID_ATTRI_SIZE); 1674 offset = MAC_WCID_ATTRIBUTE_BASE + (Wcid * HW_WCID_ATTRI_SIZE);
1717 1675
1718#ifdef CONFIG_STA_SUPPORT
1719 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1676 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1720 { 1677 {
1721 if (pEntry && pEntry->ValidAsMesh) 1678 if (pEntry && pEntry->ValidAsMesh)
@@ -1723,7 +1680,6 @@ VOID RTMPAddWcidAttributeEntry(
1723 else 1680 else
1724 WCIDAttri = (CipherAlg<<1) | SHAREDKEYTABLE; 1681 WCIDAttri = (CipherAlg<<1) | SHAREDKEYTABLE;
1725 } 1682 }
1726#endif // CONFIG_STA_SUPPORT //
1727 1683
1728 RTMP_IO_WRITE32(pAd, offset, WCIDAttri); 1684 RTMP_IO_WRITE32(pAd, offset, WCIDAttri);
1729 1685
@@ -1828,8 +1784,6 @@ CHAR *GetAuthMode(CHAR auth)
1828 ========================================================================== 1784 ==========================================================================
1829*/ 1785*/
1830#define LINE_LEN (4+33+20+8+10+9+7+3) // Channel+SSID+Bssid+WepStatus+AuthMode+Signal+WiressMode+NetworkType 1786#define LINE_LEN (4+33+20+8+10+9+7+3) // Channel+SSID+Bssid+WepStatus+AuthMode+Signal+WiressMode+NetworkType
1831#ifdef CONFIG_STA_SUPPORT
1832#endif // CONFIG_STA_SUPPORT //
1833VOID RTMPIoctlGetSiteSurvey( 1787VOID RTMPIoctlGetSiteSurvey(
1834 IN PRTMP_ADAPTER pAdapter, 1788 IN PRTMP_ADAPTER pAdapter,
1835 IN struct iwreq *wrq) 1789 IN struct iwreq *wrq)
@@ -1857,15 +1811,11 @@ VOID RTMPIoctlGetSiteSurvey(
1857 sprintf(msg+strlen(msg),"%-4s%-33s%-20s%-8s%-10s%-9s%-7s%-3s\n", 1811 sprintf(msg+strlen(msg),"%-4s%-33s%-20s%-8s%-10s%-9s%-7s%-3s\n",
1858 "Ch", "SSID", "BSSID", "Enc", "Auth", "Siganl(%)", "W-Mode", " NT"); 1812 "Ch", "SSID", "BSSID", "Enc", "Auth", "Siganl(%)", "W-Mode", " NT");
1859 1813
1860#ifdef CONFIG_STA_SUPPORT
1861#endif // CONFIG_STA_SUPPORT //
1862
1863 WaitCnt = 0; 1814 WaitCnt = 0;
1864#ifdef CONFIG_STA_SUPPORT
1865 pAdapter->StaCfg.bScanReqIsFromWebUI = TRUE; 1815 pAdapter->StaCfg.bScanReqIsFromWebUI = TRUE;
1816
1866 while ((ScanRunning(pAdapter) == TRUE) && (WaitCnt++ < 200)) 1817 while ((ScanRunning(pAdapter) == TRUE) && (WaitCnt++ < 200))
1867 OS_WAIT(500); 1818 OS_WAIT(500);
1868#endif // CONFIG_STA_SUPPORT //
1869 1819
1870 for(i=0; i<pAdapter->ScanTab.BssNr ;i++) 1820 for(i=0; i<pAdapter->ScanTab.BssNr ;i++)
1871 { 1821 {
@@ -1929,13 +1879,9 @@ VOID RTMPIoctlGetSiteSurvey(
1929 sprintf(msg+strlen(msg),"%-3s", " In"); 1879 sprintf(msg+strlen(msg),"%-3s", " In");
1930 1880
1931 sprintf(msg+strlen(msg),"\n"); 1881 sprintf(msg+strlen(msg),"\n");
1932#ifdef CONFIG_STA_SUPPORT
1933#endif // CONFIG_STA_SUPPORT //
1934 } 1882 }
1935 1883
1936#ifdef CONFIG_STA_SUPPORT
1937 pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE; 1884 pAdapter->StaCfg.bScanReqIsFromWebUI = FALSE;
1938#endif // CONFIG_STA_SUPPORT //
1939 wrq->u.data.length = strlen(msg); 1885 wrq->u.data.length = strlen(msg);
1940 Status = copy_to_user(wrq->u.data.pointer, msg, wrq->u.data.length); 1886 Status = copy_to_user(wrq->u.data.pointer, msg, wrq->u.data.length);
1941 1887
@@ -2234,9 +2180,7 @@ INT Set_HtMcs_Proc(
2234 IN PUCHAR arg) 2180 IN PUCHAR arg)
2235{ 2181{
2236 ULONG HtMcs, Mcs_tmp; 2182 ULONG HtMcs, Mcs_tmp;
2237#ifdef CONFIG_STA_SUPPORT
2238 BOOLEAN bAutoRate = FALSE; 2183 BOOLEAN bAutoRate = FALSE;
2239#endif // CONFIG_STA_SUPPORT //
2240 2184
2241 Mcs_tmp = simple_strtol(arg, 0, 10); 2185 Mcs_tmp = simple_strtol(arg, 0, 10);
2242 2186
@@ -2245,7 +2189,6 @@ INT Set_HtMcs_Proc(
2245 else 2189 else
2246 HtMcs = MCS_AUTO; 2190 HtMcs = MCS_AUTO;
2247 2191
2248#ifdef CONFIG_STA_SUPPORT
2249 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2192 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2250 { 2193 {
2251 pAd->StaCfg.DesiredTransmitSetting.field.MCS = HtMcs; 2194 pAd->StaCfg.DesiredTransmitSetting.field.MCS = HtMcs;
@@ -2281,7 +2224,6 @@ INT Set_HtMcs_Proc(
2281 if (ADHOC_ON(pAd)) 2224 if (ADHOC_ON(pAd))
2282 return TRUE; 2225 return TRUE;
2283 } 2226 }
2284#endif // CONFIG_STA_SUPPORT //
2285 2227
2286 SetCommonHT(pAd); 2228 SetCommonHT(pAd);
2287 2229
@@ -2762,10 +2704,8 @@ INT Set_FixedTxMode_Proc(
2762 fix_tx_mode = FIXED_TXMODE_CCK; 2704 fix_tx_mode = FIXED_TXMODE_CCK;
2763 } 2705 }
2764 2706
2765#ifdef CONFIG_STA_SUPPORT
2766 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2707 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2767 pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode = fix_tx_mode; 2708 pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode = fix_tx_mode;
2768#endif // CONFIG_STA_SUPPORT //
2769 2709
2770 DBGPRINT(RT_DEBUG_TRACE, ("Set_FixedTxMode_Proc::(FixedTxMode=%d)\n", fix_tx_mode)); 2710 DBGPRINT(RT_DEBUG_TRACE, ("Set_FixedTxMode_Proc::(FixedTxMode=%d)\n", fix_tx_mode));
2771 2711
@@ -2848,11 +2788,8 @@ INT Show_SSID_Proc(
2848 IN PRTMP_ADAPTER pAd, 2788 IN PRTMP_ADAPTER pAd,
2849 OUT PUCHAR pBuf) 2789 OUT PUCHAR pBuf)
2850{ 2790{
2851
2852#ifdef CONFIG_STA_SUPPORT
2853 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2791 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2854 sprintf(pBuf, "\t%s", pAd->CommonCfg.Ssid); 2792 sprintf(pBuf, "\t%s", pAd->CommonCfg.Ssid);
2855#endif // CONFIG_STA_SUPPORT //
2856 return 0; 2793 return 0;
2857} 2794}
2858 2795
@@ -3013,11 +2950,8 @@ INT Show_HtMcs_Proc(
3013 IN PRTMP_ADAPTER pAd, 2950 IN PRTMP_ADAPTER pAd,
3014 OUT PUCHAR pBuf) 2951 OUT PUCHAR pBuf)
3015{ 2952{
3016
3017#ifdef CONFIG_STA_SUPPORT
3018 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2953 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3019 sprintf(pBuf, "\t%u", pAd->StaCfg.DesiredTransmitSetting.field.MCS); 2954 sprintf(pBuf, "\t%u", pAd->StaCfg.DesiredTransmitSetting.field.MCS);
3020#endif // CONFIG_STA_SUPPORT //
3021 return 0; 2955 return 0;
3022} 2956}
3023 2957
@@ -3159,11 +3093,8 @@ INT Show_WmmCapable_Proc(
3159 IN PRTMP_ADAPTER pAd, 3093 IN PRTMP_ADAPTER pAd,
3160 OUT PUCHAR pBuf) 3094 OUT PUCHAR pBuf)
3161{ 3095{
3162
3163#ifdef CONFIG_STA_SUPPORT
3164 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3096 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3165 sprintf(pBuf, "\t%s", pAd->CommonCfg.bWmmCapable ? "TRUE":"FALSE"); 3097 sprintf(pBuf, "\t%s", pAd->CommonCfg.bWmmCapable ? "TRUE":"FALSE");
3166#endif // CONFIG_STA_SUPPORT //
3167 3098
3168 return 0; 3099 return 0;
3169} 3100}
@@ -3177,7 +3108,6 @@ INT Show_IEEE80211H_Proc(
3177 return 0; 3108 return 0;
3178} 3109}
3179 3110
3180#ifdef CONFIG_STA_SUPPORT
3181INT Show_NetworkType_Proc( 3111INT Show_NetworkType_Proc(
3182 IN PRTMP_ADAPTER pAd, 3112 IN PRTMP_ADAPTER pAd,
3183 OUT PUCHAR pBuf) 3113 OUT PUCHAR pBuf)
@@ -3202,7 +3132,6 @@ INT Show_NetworkType_Proc(
3202 } 3132 }
3203 return 0; 3133 return 0;
3204} 3134}
3205#endif // CONFIG_STA_SUPPORT //
3206 3135
3207INT Show_AuthMode_Proc( 3136INT Show_AuthMode_Proc(
3208 IN PRTMP_ADAPTER pAd, 3137 IN PRTMP_ADAPTER pAd,
@@ -3210,10 +3139,8 @@ INT Show_AuthMode_Proc(
3210{ 3139{
3211 NDIS_802_11_AUTHENTICATION_MODE AuthMode = Ndis802_11AuthModeOpen; 3140 NDIS_802_11_AUTHENTICATION_MODE AuthMode = Ndis802_11AuthModeOpen;
3212 3141
3213#ifdef CONFIG_STA_SUPPORT
3214 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3142 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3215 AuthMode = pAd->StaCfg.AuthMode; 3143 AuthMode = pAd->StaCfg.AuthMode;
3216#endif // CONFIG_STA_SUPPORT //
3217 3144
3218 if ((AuthMode >= Ndis802_11AuthModeOpen) && 3145 if ((AuthMode >= Ndis802_11AuthModeOpen) &&
3219 (AuthMode <= Ndis802_11AuthModeWPA1PSKWPA2PSK)) 3146 (AuthMode <= Ndis802_11AuthModeWPA1PSKWPA2PSK))
@@ -3230,10 +3157,8 @@ INT Show_EncrypType_Proc(
3230{ 3157{
3231 NDIS_802_11_WEP_STATUS WepStatus = Ndis802_11WEPDisabled; 3158 NDIS_802_11_WEP_STATUS WepStatus = Ndis802_11WEPDisabled;
3232 3159
3233#ifdef CONFIG_STA_SUPPORT
3234 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3160 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3235 WepStatus = pAd->StaCfg.WepStatus; 3161 WepStatus = pAd->StaCfg.WepStatus;
3236#endif // CONFIG_STA_SUPPORT //
3237 3162
3238 if ((WepStatus >= Ndis802_11WEPEnabled) && 3163 if ((WepStatus >= Ndis802_11WEPEnabled) &&
3239 (WepStatus <= Ndis802_11Encryption4KeyAbsent)) 3164 (WepStatus <= Ndis802_11Encryption4KeyAbsent))
@@ -3250,10 +3175,8 @@ INT Show_DefaultKeyID_Proc(
3250{ 3175{
3251 UCHAR DefaultKeyId = 0; 3176 UCHAR DefaultKeyId = 0;
3252 3177
3253#ifdef CONFIG_STA_SUPPORT
3254 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3178 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3255 DefaultKeyId = pAd->StaCfg.DefaultKeyId; 3179 DefaultKeyId = pAd->StaCfg.DefaultKeyId;
3256#endif // CONFIG_STA_SUPPORT //
3257 3180
3258 sprintf(pBuf, "\t%d", DefaultKeyId); 3181 sprintf(pBuf, "\t%d", DefaultKeyId);
3259 3182
@@ -3323,11 +3246,8 @@ INT Show_WPAPSK_Proc(
3323 INT idx; 3246 INT idx;
3324 UCHAR PMK[32] = {0}; 3247 UCHAR PMK[32] = {0};
3325 3248
3326
3327#ifdef CONFIG_STA_SUPPORT
3328 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3249 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3329 NdisMoveMemory(PMK, pAd->StaCfg.PMK, 32); 3250 NdisMoveMemory(PMK, pAd->StaCfg.PMK, 32);
3330#endif // CONFIG_STA_SUPPORT //
3331 3251
3332 sprintf(pBuf, "\tPMK = "); 3252 sprintf(pBuf, "\tPMK = ");
3333 for (idx = 0; idx < 32; idx++) 3253 for (idx = 0; idx < 32; idx++)
diff --git a/drivers/staging/rt3070/common/cmm_sanity.c b/drivers/staging/rt3070/common/cmm_sanity.c
index 4df3580180a..8cc74009ade 100644
--- a/drivers/staging/rt3070/common/cmm_sanity.c
+++ b/drivers/staging/rt3070/common/cmm_sanity.c
@@ -284,9 +284,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
284 OUT PQOS_CAPABILITY_PARM pQosCapability, 284 OUT PQOS_CAPABILITY_PARM pQosCapability,
285 OUT ULONG *pRalinkIe, 285 OUT ULONG *pRalinkIe,
286 OUT UCHAR *pHtCapabilityLen, 286 OUT UCHAR *pHtCapabilityLen,
287#ifdef CONFIG_STA_SUPPORT
288 OUT UCHAR *pPreNHtCapabilityLen, 287 OUT UCHAR *pPreNHtCapabilityLen,
289#endif // CONFIG_STA_SUPPORT //
290 OUT HT_CAPABILITY_IE *pHtCapability, 288 OUT HT_CAPABILITY_IE *pHtCapability,
291 OUT UCHAR *AddHtInfoLen, 289 OUT UCHAR *AddHtInfoLen,
292 OUT ADD_HT_INFO_IE *AddHtInfo, 290 OUT ADD_HT_INFO_IE *AddHtInfo,
@@ -295,9 +293,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
295 OUT PNDIS_802_11_VARIABLE_IEs pVIE) 293 OUT PNDIS_802_11_VARIABLE_IEs pVIE)
296{ 294{
297 CHAR *Ptr; 295 CHAR *Ptr;
298#ifdef CONFIG_STA_SUPPORT
299 CHAR TimLen; 296 CHAR TimLen;
300#endif // CONFIG_STA_SUPPORT //
301 PFRAME_802_11 pFrame; 297 PFRAME_802_11 pFrame;
302 PEID_STRUCT pEid; 298 PEID_STRUCT pEid;
303 UCHAR SubType; 299 UCHAR SubType;
@@ -325,10 +321,8 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
325 *pAironetCellPowerLimit = 0xFF; // Default of AironetCellPowerLimit is 0xFF 321 *pAironetCellPowerLimit = 0xFF; // Default of AironetCellPowerLimit is 0xFF
326 *LengthVIE = 0; // Set the length of VIE to init value 0 322 *LengthVIE = 0; // Set the length of VIE to init value 0
327 *pHtCapabilityLen = 0; // Set the length of VIE to init value 0 323 *pHtCapabilityLen = 0; // Set the length of VIE to init value 0
328#ifdef CONFIG_STA_SUPPORT
329 if (pAd->OpMode == OPMODE_STA) 324 if (pAd->OpMode == OPMODE_STA)
330 *pPreNHtCapabilityLen = 0; // Set the length of VIE to init value 0 325 *pPreNHtCapabilityLen = 0; // Set the length of VIE to init value 0
331#endif // CONFIG_STA_SUPPORT //
332 *AddHtInfoLen = 0; // Set the length of VIE to init value 0 326 *AddHtInfoLen = 0; // Set the length of VIE to init value 0
333 *pRalinkIe = 0; 327 *pRalinkIe = 0;
334 *pNewChannel = 0; 328 *pNewChannel = 0;
@@ -439,7 +433,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
439 *(USHORT *)(&pHtCapability->HtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->HtCapInfo)); 433 *(USHORT *)(&pHtCapability->HtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->HtCapInfo));
440 *(USHORT *)(&pHtCapability->ExtHtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->ExtHtCapInfo)); 434 *(USHORT *)(&pHtCapability->ExtHtCapInfo) = cpu2le16(*(USHORT *)(&pHtCapability->ExtHtCapInfo));
441 435
442#ifdef CONFIG_STA_SUPPORT
443 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 436 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
444 { 437 {
445 *pPreNHtCapabilityLen = 0; // Nnow we only support 26 bytes. 438 *pPreNHtCapabilityLen = 0; // Nnow we only support 26 bytes.
@@ -448,7 +441,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
448 NdisMoveMemory(Ptr + *LengthVIE, &pEid->Eid, pEid->Len + 2); 441 NdisMoveMemory(Ptr + *LengthVIE, &pEid->Eid, pEid->Len + 2);
449 *LengthVIE += (pEid->Len + 2); 442 *LengthVIE += (pEid->Len + 2);
450 } 443 }
451#endif // CONFIG_STA_SUPPORT //
452 } 444 }
453 else 445 else
454 { 446 {
@@ -469,14 +461,12 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
469 *(USHORT *)(&AddHtInfo->AddHtInfo2) = cpu2le16(*(USHORT *)(&AddHtInfo->AddHtInfo2)); 461 *(USHORT *)(&AddHtInfo->AddHtInfo2) = cpu2le16(*(USHORT *)(&AddHtInfo->AddHtInfo2));
470 *(USHORT *)(&AddHtInfo->AddHtInfo3) = cpu2le16(*(USHORT *)(&AddHtInfo->AddHtInfo3)); 462 *(USHORT *)(&AddHtInfo->AddHtInfo3) = cpu2le16(*(USHORT *)(&AddHtInfo->AddHtInfo3));
471 463
472#ifdef CONFIG_STA_SUPPORT
473 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 464 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
474 { 465 {
475 Ptr = (PUCHAR) pVIE; 466 Ptr = (PUCHAR) pVIE;
476 NdisMoveMemory(Ptr + *LengthVIE, &pEid->Eid, pEid->Len + 2); 467 NdisMoveMemory(Ptr + *LengthVIE, &pEid->Eid, pEid->Len + 2);
477 *LengthVIE += (pEid->Len + 2); 468 *LengthVIE += (pEid->Len + 2);
478 } 469 }
479#endif // CONFIG_STA_SUPPORT //
480 } 470 }
481 else 471 else
482 { 472 {
@@ -503,7 +493,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
503 if(pEid->Len == 1) 493 if(pEid->Len == 1)
504 { 494 {
505 *pChannel = *pEid->Octet; 495 *pChannel = *pEid->Octet;
506#ifdef CONFIG_STA_SUPPORT 496
507 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 497 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
508 { 498 {
509 if (ChannelSanity(pAd, *pChannel) == 0) 499 if (ChannelSanity(pAd, *pChannel) == 0)
@@ -512,7 +502,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
512 return FALSE; 502 return FALSE;
513 } 503 }
514 } 504 }
515#endif // CONFIG_STA_SUPPORT // 505
516 Sanity |= 0x4; 506 Sanity |= 0x4;
517 } 507 }
518 else 508 else
@@ -550,14 +540,13 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
550 } 540 }
551 break; 541 break;
552 542
553#ifdef CONFIG_STA_SUPPORT
554 case IE_TIM: 543 case IE_TIM:
555 if(INFRA_ON(pAd) && SubType == SUBTYPE_BEACON) 544 if(INFRA_ON(pAd) && SubType == SUBTYPE_BEACON)
556 { 545 {
557 GetTimBit((PUCHAR)pEid, pAd->StaActive.Aid, &TimLen, pBcastFlag, pDtimCount, pDtimPeriod, pMessageToMe); 546 GetTimBit((PUCHAR)pEid, pAd->StaActive.Aid, &TimLen, pBcastFlag, pDtimCount, pDtimPeriod, pMessageToMe);
558 } 547 }
559 break; 548 break;
560#endif // CONFIG_STA_SUPPORT // 549
561 case IE_CHANNEL_SWITCH_ANNOUNCEMENT: 550 case IE_CHANNEL_SWITCH_ANNOUNCEMENT:
562 if(pEid->Len == 3) 551 if(pEid->Len == 3)
563 { 552 {
@@ -599,7 +588,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
599 else 588 else
600 *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.
601 } 590 }
602#ifdef CONFIG_STA_SUPPORT
603#ifdef DOT11_N_SUPPORT 591#ifdef DOT11_N_SUPPORT
604 // This HT IE is before IEEE draft set HT IE value.2006-09-28 by Jan. 592 // This HT IE is before IEEE draft set HT IE value.2006-09-28 by Jan.
605 593
@@ -620,7 +608,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
620 } 608 }
621 } 609 }
622#endif // DOT11_N_SUPPORT // 610#endif // DOT11_N_SUPPORT //
623#endif // CONFIG_STA_SUPPORT //
624 else if (NdisEqualMemory(pEid->Octet, WPA_OUI, 4)) 611 else if (NdisEqualMemory(pEid->Octet, WPA_OUI, 4))
625 { 612 {
626 // Copy to pVIE which will report to microsoft bssid list. 613 // Copy to pVIE which will report to microsoft bssid list.
@@ -687,8 +674,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
687 pEdcaParm->Cwmax[QID_AC_VO] = CW_MAX_IN_BITS-1; 674 pEdcaParm->Cwmax[QID_AC_VO] = CW_MAX_IN_BITS-1;
688 pEdcaParm->Txop[QID_AC_VO] = 48; // AC_VO: 48*32us ~= 1.5ms 675 pEdcaParm->Txop[QID_AC_VO] = 48; // AC_VO: 48*32us ~= 1.5ms
689 } 676 }
690#ifdef CONFIG_STA_SUPPORT
691#endif // CONFIG_STA_SUPPORT //
692 else 677 else
693 { 678 {
694 } 679 }
@@ -759,7 +744,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
759 } 744 }
760 745
761 // For some 11a AP. it did not have the channel EID, patch here 746 // For some 11a AP. it did not have the channel EID, patch here
762#ifdef CONFIG_STA_SUPPORT
763 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 747 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
764 { 748 {
765 UCHAR LatchRfChannel = MsgChannel; 749 UCHAR LatchRfChannel = MsgChannel;
@@ -772,7 +756,6 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
772 Sanity |= 0x4; 756 Sanity |= 0x4;
773 } 757 }
774 } 758 }
775#endif // CONFIG_STA_SUPPORT //
776 759
777 if (Sanity != 0x7) 760 if (Sanity != 0x7)
778 { 761 {
@@ -813,10 +796,8 @@ BOOLEAN MlmeScanReqSanity(
813 796
814 if ((*pBssType == BSS_INFRA || *pBssType == BSS_ADHOC || *pBssType == BSS_ANY) 797 if ((*pBssType == BSS_INFRA || *pBssType == BSS_ADHOC || *pBssType == BSS_ANY)
815 && (*pScanType == SCAN_ACTIVE || *pScanType == SCAN_PASSIVE 798 && (*pScanType == SCAN_ACTIVE || *pScanType == SCAN_PASSIVE
816#ifdef CONFIG_STA_SUPPORT
817 || *pScanType == SCAN_CISCO_PASSIVE || *pScanType == SCAN_CISCO_ACTIVE 799 || *pScanType == SCAN_CISCO_PASSIVE || *pScanType == SCAN_CISCO_ACTIVE
818 || *pScanType == SCAN_CISCO_CHANNEL_LOAD || *pScanType == SCAN_CISCO_NOISE 800 || *pScanType == SCAN_CISCO_CHANNEL_LOAD || *pScanType == SCAN_CISCO_NOISE
819#endif // CONFIG_STA_SUPPORT //
820 )) 801 ))
821 { 802 {
822 return TRUE; 803 return TRUE;
diff --git a/drivers/staging/rt3070/common/cmm_sync.c b/drivers/staging/rt3070/common/cmm_sync.c
index 93e03291cba..ea843e22439 100644
--- a/drivers/staging/rt3070/common/cmm_sync.c
+++ b/drivers/staging/rt3070/common/cmm_sync.c
@@ -383,27 +383,21 @@ VOID ScanNextChannel(
383 NDIS_STATUS NStatus; 383 NDIS_STATUS NStatus;
384 ULONG FrameLen = 0; 384 ULONG FrameLen = 0;
385 UCHAR SsidLen = 0, ScanType = pAd->MlmeAux.ScanType, BBPValue = 0; 385 UCHAR SsidLen = 0, ScanType = pAd->MlmeAux.ScanType, BBPValue = 0;
386#ifdef CONFIG_STA_SUPPORT
387 USHORT Status; 386 USHORT Status;
388 PHEADER_802_11 pHdr80211; 387 PHEADER_802_11 pHdr80211;
389#endif // CONFIG_STA_SUPPORT //
390 UINT ScanTimeIn5gChannel = SHORT_CHANNEL_TIME; 388 UINT ScanTimeIn5gChannel = SHORT_CHANNEL_TIME;
391 389
392#ifdef CONFIG_STA_SUPPORT
393 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 390 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
394 { 391 {
395 if (MONITOR_ON(pAd)) 392 if (MONITOR_ON(pAd))
396 return; 393 return;
397 } 394 }
398#endif // CONFIG_STA_SUPPORT //
399 395
400 if (pAd->MlmeAux.Channel == 0) 396 if (pAd->MlmeAux.Channel == 0)
401 { 397 {
402 if ((pAd->CommonCfg.BBPCurrentBW == BW_40) 398 if ((pAd->CommonCfg.BBPCurrentBW == BW_40)
403#ifdef CONFIG_STA_SUPPORT
404 && (INFRA_ON(pAd) 399 && (INFRA_ON(pAd)
405 || (pAd->OpMode == OPMODE_AP)) 400 || (pAd->OpMode == OPMODE_AP))
406#endif // CONFIG_STA_SUPPORT //
407 ) 401 )
408 { 402 {
409 AsicSwitchChannel(pAd, pAd->CommonCfg.CentralChannel, FALSE); 403 AsicSwitchChannel(pAd, pAd->CommonCfg.CentralChannel, FALSE);
@@ -421,7 +415,6 @@ VOID ScanNextChannel(
421 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - End of SCAN, restore to channel %d, Total BSS[%02d]\n",pAd->CommonCfg.Channel, pAd->ScanTab.BssNr)); 415 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - End of SCAN, restore to channel %d, Total BSS[%02d]\n",pAd->CommonCfg.Channel, pAd->ScanTab.BssNr));
422 } 416 }
423 417
424#ifdef CONFIG_STA_SUPPORT
425 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 418 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
426 { 419 {
427 // 420 //
@@ -452,23 +445,18 @@ VOID ScanNextChannel(
452 Status = MLME_SUCCESS; 445 Status = MLME_SUCCESS;
453 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_SCAN_CONF, 2, &Status); 446 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_SCAN_CONF, 2, &Status);
454 } 447 }
455#endif // CONFIG_STA_SUPPORT //
456
457 448
458 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS); 449 RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_BSS_SCAN_IN_PROGRESS);
459 } 450 }
460#ifdef RT2870 451#ifdef RT2870
461#ifdef CONFIG_STA_SUPPORT
462 else if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST) && (pAd->OpMode == OPMODE_STA)) 452 else if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST) && (pAd->OpMode == OPMODE_STA))
463 { 453 {
464 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE; 454 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
465 MlmeCntlConfirm(pAd, MT2_SCAN_CONF, MLME_FAIL_NO_RESOURCE); 455 MlmeCntlConfirm(pAd, MT2_SCAN_CONF, MLME_FAIL_NO_RESOURCE);
466 } 456 }
467#endif // CONFIG_STA_SUPPORT //
468#endif // RT2870 // 457#endif // RT2870 //
469 else 458 else
470 { 459 {
471#ifdef CONFIG_STA_SUPPORT
472 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 460 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
473 { 461 {
474 // BBP and RF are not accessible in PS mode, we has to wake them up first 462 // BBP and RF are not accessible in PS mode, we has to wake them up first
@@ -479,12 +467,10 @@ VOID ScanNextChannel(
479 if (pAd->StaCfg.Psm == PWR_SAVE) 467 if (pAd->StaCfg.Psm == PWR_SAVE)
480 MlmeSetPsmBit(pAd, PWR_ACTIVE); 468 MlmeSetPsmBit(pAd, PWR_ACTIVE);
481 } 469 }
482#endif // CONFIG_STA_SUPPORT //
483 470
484 AsicSwitchChannel(pAd, pAd->MlmeAux.Channel, TRUE); 471 AsicSwitchChannel(pAd, pAd->MlmeAux.Channel, TRUE);
485 AsicLockChannel(pAd, pAd->MlmeAux.Channel); 472 AsicLockChannel(pAd, pAd->MlmeAux.Channel);
486 473
487#ifdef CONFIG_STA_SUPPORT
488 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 474 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
489 { 475 {
490 if (pAd->MlmeAux.Channel > 14) 476 if (pAd->MlmeAux.Channel > 14)
@@ -496,7 +482,6 @@ VOID ScanNextChannel(
496 } 482 }
497 } 483 }
498 } 484 }
499#endif // CONFIG_STA_SUPPORT //
500 485
501 //Global country domain(ch1-11:active scan, ch12-14 passive scan) 486 //Global country domain(ch1-11:active scan, ch12-14 passive scan)
502 if ((pAd->MlmeAux.Channel <= 14) && (pAd->MlmeAux.Channel >= 12) && ((pAd->CommonCfg.CountryRegion & 0x7f) == REGION_31_BG_BAND)) 487 if ((pAd->MlmeAux.Channel <= 14) && (pAd->MlmeAux.Channel >= 12) && ((pAd->CommonCfg.CountryRegion & 0x7f) == REGION_31_BG_BAND))
@@ -508,7 +493,6 @@ VOID ScanNextChannel(
508 // Chnage the channel scan time for CISCO stuff based on its IAPP announcement 493 // Chnage the channel scan time for CISCO stuff based on its IAPP announcement
509 if (ScanType == FAST_SCAN_ACTIVE) 494 if (ScanType == FAST_SCAN_ACTIVE)
510 RTMPSetTimer(&pAd->MlmeAux.ScanTimer, FAST_ACTIVE_SCAN_TIME); 495 RTMPSetTimer(&pAd->MlmeAux.ScanTimer, FAST_ACTIVE_SCAN_TIME);
511#ifdef CONFIG_STA_SUPPORT
512 else if (((ScanType == SCAN_CISCO_ACTIVE) || 496 else if (((ScanType == SCAN_CISCO_ACTIVE) ||
513 (ScanType == SCAN_CISCO_PASSIVE) || 497 (ScanType == SCAN_CISCO_PASSIVE) ||
514 (ScanType == SCAN_CISCO_CHANNEL_LOAD) || 498 (ScanType == SCAN_CISCO_CHANNEL_LOAD) ||
@@ -519,7 +503,6 @@ VOID ScanNextChannel(
519 else 503 else
520 RTMPSetTimer(&pAd->MlmeAux.ScanTimer, pAd->StaCfg.CCXScanTime); 504 RTMPSetTimer(&pAd->MlmeAux.ScanTimer, pAd->StaCfg.CCXScanTime);
521 } 505 }
522#endif // CONFIG_STA_SUPPORT //
523 else // must be SCAN_PASSIVE or SCAN_ACTIVE 506 else // must be SCAN_PASSIVE or SCAN_ACTIVE
524 { 507 {
525 if ((pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED) 508 if ((pAd->CommonCfg.PhyMode == PHY_11ABG_MIXED)
@@ -544,14 +527,13 @@ VOID ScanNextChannel(
544 if (NStatus != NDIS_STATUS_SUCCESS) 527 if (NStatus != NDIS_STATUS_SUCCESS)
545 { 528 {
546 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - ScanNextChannel() allocate memory fail\n")); 529 DBGPRINT(RT_DEBUG_TRACE, ("SYNC - ScanNextChannel() allocate memory fail\n"));
547#ifdef CONFIG_STA_SUPPORT 530
548 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 531 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
549 { 532 {
550 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE; 533 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
551 Status = MLME_FAIL_NO_RESOURCE; 534 Status = MLME_FAIL_NO_RESOURCE;
552 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_SCAN_CONF, 2, &Status); 535 MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_SCAN_CONF, 2, &Status);
553 } 536 }
554#endif // CONFIG_STA_SUPPORT //
555 537
556 return; 538 return;
557 } 539 }
@@ -624,11 +606,8 @@ VOID ScanNextChannel(
624 606
625 // For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe reponse 607 // For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe reponse
626 608
627#ifdef CONFIG_STA_SUPPORT
628 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 609 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
629 pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; 610 pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN;
630#endif // CONFIG_STA_SUPPORT //
631
632 } 611 }
633} 612}
634 613
diff --git a/drivers/staging/rt3070/common/cmm_wpa.c b/drivers/staging/rt3070/common/cmm_wpa.c
index 81c332ac252..bcf70763641 100644
--- a/drivers/staging/rt3070/common/cmm_wpa.c
+++ b/drivers/staging/rt3070/common/cmm_wpa.c
@@ -589,7 +589,6 @@ VOID RTMPMakeRSNIE(
589 rsnielen_ex_cur_p = NULL; 589 rsnielen_ex_cur_p = NULL;
590 590
591 { 591 {
592#ifdef CONFIG_STA_SUPPORT
593 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 592 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
594 { 593 {
595#ifdef WPA_SUPPLICANT_SUPPORT 594#ifdef WPA_SUPPLICANT_SUPPORT
@@ -622,7 +621,6 @@ VOID RTMPMakeRSNIE(
622 621
623 bMixCipher = pAd->StaCfg.bMixCipher; 622 bMixCipher = pAd->StaCfg.bMixCipher;
624 } 623 }
625#endif // CONFIG_STA_SUPPORT //
626 } 624 }
627 625
628 // indicate primary RSNIE as WPA or WPA2 626 // indicate primary RSNIE as WPA or WPA2
@@ -1093,11 +1091,6 @@ BOOLEAN RTMPParseEapolKeyData(
1093 return FALSE; 1091 return FALSE;
1094 } 1092 }
1095 1093
1096
1097#ifdef CONFIG_STA_SUPPORT
1098 // Todo
1099#endif // CONFIG_STA_SUPPORT //
1100
1101 return TRUE; 1094 return TRUE;
1102 1095
1103} 1096}
diff --git a/drivers/staging/rt3070/common/mlme.c b/drivers/staging/rt3070/common/mlme.c
index f483e3b93d2..348d234d4db 100644
--- a/drivers/staging/rt3070/common/mlme.c
+++ b/drivers/staging/rt3070/common/mlme.c
@@ -50,11 +50,9 @@ 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 CONFIG_STA_SUPPORT
54#ifdef DOT11_N_SUPPORT 53#ifdef DOT11_N_SUPPORT
55UCHAR PRE_N_HT_OUI[] = {0x00, 0x90, 0x4c}; 54UCHAR PRE_N_HT_OUI[] = {0x00, 0x90, 0x4c};
56#endif // DOT11_N_SUPPORT // 55#endif // DOT11_N_SUPPORT //
57#endif // CONFIG_STA_SUPPORT //
58 56
59UCHAR RateSwitchTable[] = { 57UCHAR RateSwitchTable[] = {
60// 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) 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)
@@ -495,7 +493,6 @@ NDIS_STATUS MlmeInit(
495 pAd->Mlme.bRunning = FALSE; 493 pAd->Mlme.bRunning = FALSE;
496 NdisAllocateSpinLock(&pAd->Mlme.TaskLock); 494 NdisAllocateSpinLock(&pAd->Mlme.TaskLock);
497 495
498#ifdef CONFIG_STA_SUPPORT
499 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 496 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
500 { 497 {
501 BssTableInit(&pAd->ScanTab); 498 BssTableInit(&pAd->ScanTab);
@@ -512,9 +509,6 @@ NDIS_STATUS MlmeInit(
512 // state machine init 509 // state machine init
513 MlmeCntlInit(pAd, &pAd->Mlme.CntlMachine, NULL); 510 MlmeCntlInit(pAd, &pAd->Mlme.CntlMachine, NULL);
514 } 511 }
515#endif // CONFIG_STA_SUPPORT //
516
517
518 512
519 ActionStateMachineInit(pAd, &pAd->Mlme.ActMachine, pAd->Mlme.ActFunc); 513 ActionStateMachineInit(pAd, &pAd->Mlme.ActMachine, pAd->Mlme.ActFunc);
520 514
@@ -526,11 +520,6 @@ NDIS_STATUS MlmeInit(
526 520
527 // software-based RX Antenna diversity 521 // software-based RX Antenna diversity
528 RTMPInitTimer(pAd, &pAd->Mlme.RxAntEvalTimer, GET_TIMER_FUNCTION(AsicRxAntEvalTimeout), pAd, FALSE); 522 RTMPInitTimer(pAd, &pAd->Mlme.RxAntEvalTimer, GET_TIMER_FUNCTION(AsicRxAntEvalTimeout), pAd, FALSE);
529
530
531#ifdef CONFIG_STA_SUPPORT
532#endif // CONFIG_STA_SUPPORT //
533
534 } while (FALSE); 523 } while (FALSE);
535 524
536 DBGPRINT(RT_DEBUG_TRACE, ("<-- MLME Initialize\n")); 525 DBGPRINT(RT_DEBUG_TRACE, ("<-- MLME Initialize\n"));
@@ -600,7 +589,6 @@ VOID MlmeHandler(
600 switch (Elem->Machine) 589 switch (Elem->Machine)
601 { 590 {
602 // STA state machines 591 // STA state machines
603#ifdef CONFIG_STA_SUPPORT
604 case ASSOC_STATE_MACHINE: 592 case ASSOC_STATE_MACHINE:
605 StateMachinePerformAction(pAd, &pAd->Mlme.AssocMachine, Elem); 593 StateMachinePerformAction(pAd, &pAd->Mlme.AssocMachine, Elem);
606 break; 594 break;
@@ -622,8 +610,6 @@ VOID MlmeHandler(
622 case AIRONET_STATE_MACHINE: 610 case AIRONET_STATE_MACHINE:
623 StateMachinePerformAction(pAd, &pAd->Mlme.AironetMachine, Elem); 611 StateMachinePerformAction(pAd, &pAd->Mlme.AironetMachine, Elem);
624 break; 612 break;
625#endif // CONFIG_STA_SUPPORT //
626
627 case ACTION_STATE_MACHINE: 613 case ACTION_STATE_MACHINE:
628 StateMachinePerformAction(pAd, &pAd->Mlme.ActMachine, Elem); 614 StateMachinePerformAction(pAd, &pAd->Mlme.ActMachine, Elem);
629 break; 615 break;
@@ -680,7 +666,6 @@ VOID MlmeHalt(
680 AsicDisableSync(pAd); 666 AsicDisableSync(pAd);
681 } 667 }
682 668
683#ifdef CONFIG_STA_SUPPORT
684 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 669 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
685 { 670 {
686 // Cancel pending timers 671 // Cancel pending timers
@@ -691,7 +676,6 @@ VOID MlmeHalt(
691 RTMPCancelTimer(&pAd->MlmeAux.BeaconTimer, &Cancelled); 676 RTMPCancelTimer(&pAd->MlmeAux.BeaconTimer, &Cancelled);
692 RTMPCancelTimer(&pAd->MlmeAux.ScanTimer, &Cancelled); 677 RTMPCancelTimer(&pAd->MlmeAux.ScanTimer, &Cancelled);
693 } 678 }
694#endif // CONFIG_STA_SUPPORT //
695 679
696 RTMPCancelTimer(&pAd->Mlme.PeriodicTimer, &Cancelled); 680 RTMPCancelTimer(&pAd->Mlme.PeriodicTimer, &Cancelled);
697 RTMPCancelTimer(&pAd->Mlme.RxAntEvalTimer, &Cancelled); 681 RTMPCancelTimer(&pAd->Mlme.RxAntEvalTimer, &Cancelled);
@@ -794,9 +778,6 @@ VOID MlmePeriodicExec(
794 ULONG TxTotalCnt; 778 ULONG TxTotalCnt;
795 PRTMP_ADAPTER pAd = (RTMP_ADAPTER *)FunctionContext; 779 PRTMP_ADAPTER pAd = (RTMP_ADAPTER *)FunctionContext;
796 780
797#ifdef CONFIG_STA_SUPPORT
798#endif // CONFIG_STA_SUPPORT //
799
800 // Do nothing if the driver is starting halt state. 781 // Do nothing if the driver is starting halt state.
801 // This might happen when timer already been fired before cancel timer with mlmehalt 782 // This might happen when timer already been fired before cancel timer with mlmehalt
802 if ((RTMP_TEST_FLAG(pAd, (fRTMP_ADAPTER_HALT_IN_PROGRESS | 783 if ((RTMP_TEST_FLAG(pAd, (fRTMP_ADAPTER_HALT_IN_PROGRESS |
@@ -807,7 +788,6 @@ VOID MlmePeriodicExec(
807 788
808 RT28XX_MLME_PRE_SANITY_CHECK(pAd); 789 RT28XX_MLME_PRE_SANITY_CHECK(pAd);
809 790
810#ifdef CONFIG_STA_SUPPORT
811 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 791 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
812 { 792 {
813 // Do nothing if monitor mode is on 793 // Do nothing if monitor mode is on
@@ -833,7 +813,6 @@ VOID MlmePeriodicExec(
833 } 813 }
834 } 814 }
835 } 815 }
836#endif // CONFIG_STA_SUPPORT //
837 816
838 pAd->bUpdateBcnCntDone = FALSE; 817 pAd->bUpdateBcnCntDone = FALSE;
839 818
@@ -847,7 +826,6 @@ VOID MlmePeriodicExec(
847 // execute every 500ms 826 // execute every 500ms
848 if ((pAd->Mlme.PeriodicRound % 5 == 0) && RTMPAutoRateSwitchCheck(pAd)/*(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_TX_RATE_SWITCH_ENABLED))*/) 827 if ((pAd->Mlme.PeriodicRound % 5 == 0) && RTMPAutoRateSwitchCheck(pAd)/*(OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_TX_RATE_SWITCH_ENABLED))*/)
849 { 828 {
850#ifdef CONFIG_STA_SUPPORT
851 // perform dynamic tx rate switching based on past TX history 829 // perform dynamic tx rate switching based on past TX history
852 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 830 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
853 { 831 {
@@ -856,7 +834,6 @@ VOID MlmePeriodicExec(
856 && (!OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE))) 834 && (!OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_DOZE)))
857 MlmeDynamicTxRateSwitching(pAd); 835 MlmeDynamicTxRateSwitching(pAd);
858 } 836 }
859#endif // CONFIG_STA_SUPPORT //
860 } 837 }
861 838
862 // Normal 1 second Mlme PeriodicExec. 839 // Normal 1 second Mlme PeriodicExec.
@@ -932,14 +909,11 @@ VOID MlmePeriodicExec(
932 } 909 }
933 } 910 }
934 911
935#ifdef CONFIG_STA_SUPPORT
936 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 912 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
937 STAMlmePeriodicExec(pAd); 913 STAMlmePeriodicExec(pAd);
938#endif // CONFIG_STA_SUPPORT //
939 914
940 MlmeResetRalinkCounters(pAd); 915 MlmeResetRalinkCounters(pAd);
941 916
942#ifdef CONFIG_STA_SUPPORT
943 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 917 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
944 { 918 {
945 { 919 {
@@ -963,7 +937,6 @@ VOID MlmePeriodicExec(
963 } 937 }
964 } 938 }
965 } 939 }
966#endif // CONFIG_STA_SUPPORT //
967 940
968 RT28XX_MLME_HANDLER(pAd); 941 RT28XX_MLME_HANDLER(pAd);
969 } 942 }
@@ -972,7 +945,6 @@ VOID MlmePeriodicExec(
972 pAd->bUpdateBcnCntDone = FALSE; 945 pAd->bUpdateBcnCntDone = FALSE;
973} 946}
974 947
975#ifdef CONFIG_STA_SUPPORT
976VOID STAMlmePeriodicExec( 948VOID STAMlmePeriodicExec(
977 PRTMP_ADAPTER pAd) 949 PRTMP_ADAPTER pAd)
978{ 950{
@@ -1263,7 +1235,6 @@ VOID MlmeAutoReconnectLastSSID(
1263 RT28XX_MLME_HANDLER(pAd); 1235 RT28XX_MLME_HANDLER(pAd);
1264 } 1236 }
1265} 1237}
1266#endif // CONFIG_STA_SUPPORT //
1267 1238
1268/* 1239/*
1269 ========================================================================== 1240 ==========================================================================
@@ -1312,7 +1283,6 @@ VOID MlmeSelectTxRateTable(
1312 break; 1283 break;
1313 } 1284 }
1314 1285
1315#ifdef CONFIG_STA_SUPPORT
1316 if ((pAd->OpMode == OPMODE_STA) && ADHOC_ON(pAd)) 1286 if ((pAd->OpMode == OPMODE_STA) && ADHOC_ON(pAd))
1317 { 1287 {
1318#ifdef DOT11_N_SUPPORT 1288#ifdef DOT11_N_SUPPORT
@@ -1373,7 +1343,6 @@ VOID MlmeSelectTxRateTable(
1373 } 1343 }
1374 break; 1344 break;
1375 } 1345 }
1376#endif // CONFIG_STA_SUPPORT //
1377 1346
1378#ifdef DOT11_N_SUPPORT 1347#ifdef DOT11_N_SUPPORT
1379 //if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen == 12) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0xff) && 1348 //if ((pAd->StaActive.SupRateLen + pAd->StaActive.ExtRateLen == 12) && (pAd->StaActive.SupportedPhyInfo.MCSSet[0] == 0xff) &&
@@ -1484,7 +1453,6 @@ VOID MlmeSelectTxRateTable(
1484#ifdef DOT11_N_SUPPORT 1453#ifdef DOT11_N_SUPPORT
1485#endif // DOT11_N_SUPPORT // 1454#endif // DOT11_N_SUPPORT //
1486 1455
1487#ifdef CONFIG_STA_SUPPORT
1488 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1456 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1489 { 1457 {
1490#ifdef DOT11_N_SUPPORT 1458#ifdef DOT11_N_SUPPORT
@@ -1552,11 +1520,9 @@ VOID MlmeSelectTxRateTable(
1552 DBGPRINT_RAW(RT_DEBUG_ERROR,("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n", 1520 DBGPRINT_RAW(RT_DEBUG_ERROR,("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n",
1553 pAd->StaActive.SupRateLen, pAd->StaActive.ExtRateLen, pAd->StaActive.SupportedPhyInfo.MCSSet[0], pAd->StaActive.SupportedPhyInfo.MCSSet[1])); 1521 pAd->StaActive.SupRateLen, pAd->StaActive.ExtRateLen, pAd->StaActive.SupportedPhyInfo.MCSSet[0], pAd->StaActive.SupportedPhyInfo.MCSSet[1]));
1554 } 1522 }
1555#endif // CONFIG_STA_SUPPORT //
1556 } while(FALSE); 1523 } while(FALSE);
1557} 1524}
1558 1525
1559#ifdef CONFIG_STA_SUPPORT
1560/* 1526/*
1561 ========================================================================== 1527 ==========================================================================
1562 Description: 1528 Description:
@@ -2685,8 +2651,6 @@ VOID MlmeSetPsmBit(
2685 csr4.field.AckCtsPsmBit = (psm == PWR_SAVE)? 1:0; 2651 csr4.field.AckCtsPsmBit = (psm == PWR_SAVE)? 1:0;
2686 RTMP_IO_WRITE32(pAd, AUTO_RSP_CFG, csr4.word); 2652 RTMP_IO_WRITE32(pAd, AUTO_RSP_CFG, csr4.word);
2687} 2653}
2688#endif // CONFIG_STA_SUPPORT //
2689
2690 2654
2691// IRQL = DISPATCH_LEVEL 2655// IRQL = DISPATCH_LEVEL
2692VOID MlmeSetTxPreamble( 2656VOID MlmeSetTxPreamble(
@@ -2825,8 +2789,6 @@ VOID MlmeUpdateTxRates(
2825 2789
2826//=========================================================================== 2790//===========================================================================
2827//=========================================================================== 2791//===========================================================================
2828
2829#ifdef CONFIG_STA_SUPPORT
2830 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2792 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2831 { 2793 {
2832 pHtPhy = &pAd->StaCfg.HTPhyMode; 2794 pHtPhy = &pAd->StaCfg.HTPhyMode;
@@ -2843,7 +2805,6 @@ VOID MlmeUpdateTxRates(
2843 MaxDesire = RATE_11; 2805 MaxDesire = RATE_11;
2844 } 2806 }
2845 } 2807 }
2846#endif // CONFIG_STA_SUPPORT //
2847 2808
2848 pAd->CommonCfg.MaxDesiredRate = MaxDesire; 2809 pAd->CommonCfg.MaxDesiredRate = MaxDesire;
2849 pMinHtPhy->word = 0; 2810 pMinHtPhy->word = 0;
@@ -2880,7 +2841,6 @@ VOID MlmeUpdateTxRates(
2880 } 2841 }
2881#endif 2842#endif
2882 2843
2883#ifdef CONFIG_STA_SUPPORT
2884 if ((ADHOC_ON(pAd) || INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA)) 2844 if ((ADHOC_ON(pAd) || INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA))
2885 { 2845 {
2886 pSupRate = &pAd->StaActive.SupRate[0]; 2846 pSupRate = &pAd->StaActive.SupRate[0];
@@ -2889,7 +2849,6 @@ VOID MlmeUpdateTxRates(
2889 ExtRateLen = pAd->StaActive.ExtRateLen; 2849 ExtRateLen = pAd->StaActive.ExtRateLen;
2890 } 2850 }
2891 else 2851 else
2892#endif // CONFIG_STA_SUPPORT //
2893 { 2852 {
2894 pSupRate = &pAd->CommonCfg.SupRate[0]; 2853 pSupRate = &pAd->CommonCfg.SupRate[0];
2895 pExtRate = &pAd->CommonCfg.ExtRate[0]; 2854 pExtRate = &pAd->CommonCfg.ExtRate[0];
@@ -2974,10 +2933,10 @@ VOID MlmeUpdateTxRates(
2974 if (*auto_rate_cur_p) 2933 if (*auto_rate_cur_p)
2975 { 2934 {
2976 short dbm = 0; 2935 short dbm = 0;
2977#ifdef CONFIG_STA_SUPPORT 2936
2978 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2937 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2979 dbm = pAd->StaCfg.RssiSample.AvgRssi0 - pAd->BbpRssiToDbmDelta; 2938 dbm = pAd->StaCfg.RssiSample.AvgRssi0 - pAd->BbpRssiToDbmDelta;
2980#endif // CONFIG_STA_SUPPORT // 2939
2981 if (bLinkUp == TRUE) 2940 if (bLinkUp == TRUE)
2982 pAd->CommonCfg.TxRate = RATE_24; 2941 pAd->CommonCfg.TxRate = RATE_24;
2983 else 2942 else
@@ -3141,7 +3100,6 @@ VOID MlmeUpdateHtTxRates(
3141 3100
3142 auto_rate_cur_p = NULL; 3101 auto_rate_cur_p = NULL;
3143 3102
3144#ifdef CONFIG_STA_SUPPORT
3145 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3103 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3146 { 3104 {
3147 pDesireHtPhy = &pAd->StaCfg.DesiredHtPhyInfo; 3105 pDesireHtPhy = &pAd->StaCfg.DesiredHtPhyInfo;
@@ -3152,9 +3110,7 @@ VOID MlmeUpdateHtTxRates(
3152 3110
3153 auto_rate_cur_p = &pAd->StaCfg.bAutoTxRateSwitch; 3111 auto_rate_cur_p = &pAd->StaCfg.bAutoTxRateSwitch;
3154 } 3112 }
3155#endif // CONFIG_STA_SUPPORT //
3156 3113
3157#ifdef CONFIG_STA_SUPPORT
3158 if ((ADHOC_ON(pAd) || INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA)) 3114 if ((ADHOC_ON(pAd) || INFRA_ON(pAd)) && (pAd->OpMode == OPMODE_STA))
3159 { 3115 {
3160 if (pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) 3116 if (pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE)
@@ -3170,7 +3126,6 @@ VOID MlmeUpdateHtTxRates(
3170 pMaxHtPhy->field.STBC = STBC_NONE; 3126 pMaxHtPhy->field.STBC = STBC_NONE;
3171 } 3127 }
3172 else 3128 else
3173#endif // CONFIG_STA_SUPPORT //
3174 { 3129 {
3175 if (pDesireHtPhy->bHtEnable == FALSE) 3130 if (pDesireHtPhy->bHtEnable == FALSE)
3176 return; 3131 return;
@@ -3221,7 +3176,6 @@ VOID MlmeUpdateHtTxRates(
3221 pMinHtPhy->field.STBC = 0; 3176 pMinHtPhy->field.STBC = 0;
3222 pMinHtPhy->field.ShortGI = 0; 3177 pMinHtPhy->field.ShortGI = 0;
3223 //If STA assigns fixed rate. update to fixed here. 3178 //If STA assigns fixed rate. update to fixed here.
3224#ifdef CONFIG_STA_SUPPORT
3225 if ( (pAd->OpMode == OPMODE_STA) && (pDesireHtPhy->MCSSet[0] != 0xff)) 3179 if ( (pAd->OpMode == OPMODE_STA) && (pDesireHtPhy->MCSSet[0] != 0xff))
3226 { 3180 {
3227 if (pDesireHtPhy->MCSSet[4] != 0) 3181 if (pDesireHtPhy->MCSSet[4] != 0)
@@ -3245,8 +3199,6 @@ VOID MlmeUpdateHtTxRates(
3245 break; 3199 break;
3246 } 3200 }
3247 } 3201 }
3248#endif // CONFIG_STA_SUPPORT //
3249
3250 3202
3251 // Decide ht rate 3203 // Decide ht rate
3252 pHtPhy->field.STBC = pMaxHtPhy->field.STBC; 3204 pHtPhy->field.STBC = pMaxHtPhy->field.STBC;
@@ -3628,7 +3580,6 @@ VOID BssEntrySet(
3628 else 3580 else
3629 pBss->QbssLoad.bValid = FALSE; 3581 pBss->QbssLoad.bValid = FALSE;
3630 3582
3631#ifdef CONFIG_STA_SUPPORT
3632 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3583 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3633 { 3584 {
3634 PEID_STRUCT pEid; 3585 PEID_STRUCT pEid;
@@ -3673,7 +3624,6 @@ VOID BssEntrySet(
3673 pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len); 3624 pEid = (PEID_STRUCT)((UCHAR*)pEid + 2 + pEid->Len);
3674 } 3625 }
3675 } 3626 }
3676#endif // CONFIG_STA_SUPPORT //
3677} 3627}
3678 3628
3679/*! 3629/*!
@@ -3780,7 +3730,6 @@ ULONG BssTableSetEntry(
3780 return Idx; 3730 return Idx;
3781} 3731}
3782 3732
3783#ifdef CONFIG_STA_SUPPORT
3784// IRQL = DISPATCH_LEVEL 3733// IRQL = DISPATCH_LEVEL
3785VOID BssTableSsidSort( 3734VOID BssTableSsidSort(
3786 IN PRTMP_ADAPTER pAd, 3735 IN PRTMP_ADAPTER pAd,
@@ -4031,8 +3980,6 @@ VOID BssTableSortByRssi(
4031 } 3980 }
4032 } 3981 }
4033} 3982}
4034#endif // CONFIG_STA_SUPPORT //
4035
4036 3983
4037VOID BssCipherParse( 3984VOID BssCipherParse(
4038 IN OUT PBSS_ENTRY pBss) 3985 IN OUT PBSS_ENTRY pBss)
@@ -4432,10 +4379,10 @@ VOID MgtMacHeaderInit(
4432// pHdr80211->FC.Type = BTYPE_CNTL; 4379// pHdr80211->FC.Type = BTYPE_CNTL;
4433 pHdr80211->FC.ToDs = ToDs; 4380 pHdr80211->FC.ToDs = ToDs;
4434 COPY_MAC_ADDR(pHdr80211->Addr1, pDA); 4381 COPY_MAC_ADDR(pHdr80211->Addr1, pDA);
4435#ifdef CONFIG_STA_SUPPORT 4382
4436 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 4383 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
4437 COPY_MAC_ADDR(pHdr80211->Addr2, pAd->CurrentAddress); 4384 COPY_MAC_ADDR(pHdr80211->Addr2, pAd->CurrentAddress);
4438#endif // CONFIG_STA_SUPPORT // 4385
4439 COPY_MAC_ADDR(pHdr80211->Addr3, pBssid); 4386 COPY_MAC_ADDR(pHdr80211->Addr3, pBssid);
4440} 4387}
4441 4388
@@ -4642,7 +4589,6 @@ BOOLEAN MlmeEnqueueForRecv(
4642 return FALSE; 4589 return FALSE;
4643 } 4590 }
4644 4591
4645#ifdef CONFIG_STA_SUPPORT
4646 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 4592 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
4647 { 4593 {
4648 if (!MsgTypeSubst(pAd, pFrame, &Machine, &MsgType)) 4594 if (!MsgTypeSubst(pAd, pFrame, &Machine, &MsgType))
@@ -4651,7 +4597,6 @@ BOOLEAN MlmeEnqueueForRecv(
4651 return FALSE; 4597 return FALSE;
4652 } 4598 }
4653 } 4599 }
4654#endif // CONFIG_STA_SUPPORT //
4655 4600
4656 // OK, we got all the informations, it is time to put things into queue 4601 // OK, we got all the informations, it is time to put things into queue
4657 NdisAcquireSpinLock(&(Queue->Lock)); 4602 NdisAcquireSpinLock(&(Queue->Lock));
@@ -4719,14 +4664,10 @@ BOOLEAN MlmeDequeue(
4719VOID MlmeRestartStateMachine( 4664VOID MlmeRestartStateMachine(
4720 IN PRTMP_ADAPTER pAd) 4665 IN PRTMP_ADAPTER pAd)
4721{ 4666{
4722#ifdef CONFIG_STA_SUPPORT
4723 BOOLEAN Cancelled; 4667 BOOLEAN Cancelled;
4724#endif // CONFIG_STA_SUPPORT //
4725 4668
4726 DBGPRINT(RT_DEBUG_TRACE, ("MlmeRestartStateMachine \n")); 4669 DBGPRINT(RT_DEBUG_TRACE, ("MlmeRestartStateMachine \n"));
4727 4670
4728
4729#ifdef CONFIG_STA_SUPPORT
4730 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 4671 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
4731 { 4672 {
4732 // Cancel all timer events 4673 // Cancel all timer events
@@ -4738,7 +4679,6 @@ VOID MlmeRestartStateMachine(
4738 RTMPCancelTimer(&pAd->MlmeAux.BeaconTimer, &Cancelled); 4679 RTMPCancelTimer(&pAd->MlmeAux.BeaconTimer, &Cancelled);
4739 RTMPCancelTimer(&pAd->MlmeAux.ScanTimer, &Cancelled); 4680 RTMPCancelTimer(&pAd->MlmeAux.ScanTimer, &Cancelled);
4740 } 4681 }
4741#endif // CONFIG_STA_SUPPORT //
4742 4682
4743 // Change back to original channel in case of doing scan 4683 // Change back to original channel in case of doing scan
4744 AsicSwitchChannel(pAd, pAd->CommonCfg.Channel, FALSE); 4684 AsicSwitchChannel(pAd, pAd->CommonCfg.Channel, FALSE);
@@ -4747,7 +4687,6 @@ VOID MlmeRestartStateMachine(
4747 // Resume MSDU which is turned off durning scan 4687 // Resume MSDU which is turned off durning scan
4748 RTMPResumeMsduTransmission(pAd); 4688 RTMPResumeMsduTransmission(pAd);
4749 4689
4750#ifdef CONFIG_STA_SUPPORT
4751 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 4690 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
4752 { 4691 {
4753 // Set all state machines back IDLE 4692 // Set all state machines back IDLE
@@ -4758,8 +4697,6 @@ VOID MlmeRestartStateMachine(
4758 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE; 4697 pAd->Mlme.SyncMachine.CurrState = SYNC_IDLE;
4759 pAd->Mlme.ActMachine.CurrState = ACT_IDLE; 4698 pAd->Mlme.ActMachine.CurrState = ACT_IDLE;
4760 } 4699 }
4761#endif // CONFIG_STA_SUPPORT //
4762
4763} 4700}
4764 4701
4765/*! \brief test if the MLME Queue is empty 4702/*! \brief test if the MLME Queue is empty
@@ -4837,7 +4774,6 @@ VOID MlmeQueueDestroy(
4837 IRQL = DISPATCH_LEVEL 4774 IRQL = DISPATCH_LEVEL
4838 4775
4839 */ 4776 */
4840#ifdef CONFIG_STA_SUPPORT
4841BOOLEAN MsgTypeSubst( 4777BOOLEAN MsgTypeSubst(
4842 IN PRTMP_ADAPTER pAd, 4778 IN PRTMP_ADAPTER pAd,
4843 IN PFRAME_802_11 pFrame, 4779 IN PFRAME_802_11 pFrame,
@@ -4947,7 +4883,6 @@ BOOLEAN MsgTypeSubst(
4947 4883
4948 return TRUE; 4884 return TRUE;
4949} 4885}
4950#endif // CONFIG_STA_SUPPORT //
4951 4886
4952// =========================================================================================== 4887// ===========================================================================================
4953// state_machine.c 4888// state_machine.c
@@ -6161,7 +6096,6 @@ VOID AsicAntennaSelect(
6161 SHORT realavgrssi1; 6096 SHORT realavgrssi1;
6162 6097
6163 // if no traffic then reset average rssi to trigger evaluation 6098 // if no traffic then reset average rssi to trigger evaluation
6164#ifdef CONFIG_STA_SUPPORT
6165 if (pAd->StaCfg.NumOfAvgRssiSample < 5) 6099 if (pAd->StaCfg.NumOfAvgRssiSample < 5)
6166 { 6100 {
6167 pAd->RxAnt.Pair1LastAvgRssi = (-99); 6101 pAd->RxAnt.Pair1LastAvgRssi = (-99);
@@ -6170,7 +6104,6 @@ VOID AsicAntennaSelect(
6170 } 6104 }
6171 6105
6172 pAd->StaCfg.NumOfAvgRssiSample = 0; 6106 pAd->StaCfg.NumOfAvgRssiSample = 0;
6173#endif // CONFIG_STA_SUPPORT //
6174 realavgrssi1 = (pAd->RxAnt.Pair1AvgRssi[pAd->RxAnt.Pair1PrimaryRxAnt] >> 3); 6107 realavgrssi1 = (pAd->RxAnt.Pair1AvgRssi[pAd->RxAnt.Pair1PrimaryRxAnt] >> 3);
6175 6108
6176 DBGPRINT(RT_DEBUG_TRACE,("Ant-realrssi0(%d), Lastrssi0(%d), EvaluateStableCnt=%d\n", realavgrssi1, pAd->RxAnt.Pair1LastAvgRssi, pAd->RxAnt.EvaluateStableCnt)); 6109 DBGPRINT(RT_DEBUG_TRACE,("Ant-realrssi0(%d), Lastrssi0(%d), EvaluateStableCnt=%d\n", realavgrssi1, pAd->RxAnt.Pair1LastAvgRssi, pAd->RxAnt.EvaluateStableCnt));
@@ -6480,7 +6413,6 @@ VOID AsicAdjustTxPower(
6480 6413
6481} 6414}
6482 6415
6483#ifdef CONFIG_STA_SUPPORT
6484/* 6416/*
6485 ========================================================================== 6417 ==========================================================================
6486 Description: 6418 Description:
@@ -6531,7 +6463,7 @@ VOID AsicForceWakeup(
6531 DBGPRINT(RT_DEBUG_TRACE, ("--> AsicForceWakeup \n")); 6463 DBGPRINT(RT_DEBUG_TRACE, ("--> AsicForceWakeup \n"));
6532 RT28XX_STA_FORCE_WAKEUP(pAd, bFromTx); 6464 RT28XX_STA_FORCE_WAKEUP(pAd, bFromTx);
6533} 6465}
6534#endif // CONFIG_STA_SUPPORT // 6466
6535/* 6467/*
6536 ========================================================================== 6468 ==========================================================================
6537 Description: 6469 Description:
@@ -6709,7 +6641,7 @@ VOID AsicEnableBssSync(
6709 6641
6710 RTMP_IO_READ32(pAd, BCN_TIME_CFG, &csr.word); 6642 RTMP_IO_READ32(pAd, BCN_TIME_CFG, &csr.word);
6711// RTMP_IO_WRITE32(pAd, BCN_TIME_CFG, 0x00000000); 6643// RTMP_IO_WRITE32(pAd, BCN_TIME_CFG, 0x00000000);
6712#ifdef CONFIG_STA_SUPPORT 6644
6713 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 6645 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
6714 { 6646 {
6715 csr.field.BeaconInterval = pAd->CommonCfg.BeaconPeriod << 4; // ASIC register in units of 1/16 TU 6647 csr.field.BeaconInterval = pAd->CommonCfg.BeaconPeriod << 4; // ASIC register in units of 1/16 TU
@@ -6718,7 +6650,7 @@ VOID AsicEnableBssSync(
6718 csr.field.bBeaconGen = 0; // do NOT generate BEACON 6650 csr.field.bBeaconGen = 0; // do NOT generate BEACON
6719 csr.field.bTBTTEnable = 1; 6651 csr.field.bTBTTEnable = 1;
6720 } 6652 }
6721#endif // CONFIG_STA_SUPPORT // 6653
6722 RTMP_IO_WRITE32(pAd, BCN_TIME_CFG, csr.word); 6654 RTMP_IO_WRITE32(pAd, BCN_TIME_CFG, csr.word);
6723} 6655}
6724 6656
@@ -6929,7 +6861,6 @@ VOID AsicSetEdcaParm(
6929 Ac2Cfg.field.Cwmax = pEdcaParm->Cwmax[QID_AC_VI]; 6861 Ac2Cfg.field.Cwmax = pEdcaParm->Cwmax[QID_AC_VI];
6930 Ac2Cfg.field.Aifsn = pEdcaParm->Aifsn[QID_AC_VI]; 6862 Ac2Cfg.field.Aifsn = pEdcaParm->Aifsn[QID_AC_VI];
6931 6863
6932#ifdef CONFIG_STA_SUPPORT
6933 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 6864 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
6934 { 6865 {
6935 // Tuning for Wi-Fi WMM S06 6866 // Tuning for Wi-Fi WMM S06
@@ -6954,7 +6885,6 @@ VOID AsicSetEdcaParm(
6954 } 6885 }
6955#endif // RT30xx // 6886#endif // RT30xx //
6956 } 6887 }
6957#endif // CONFIG_STA_SUPPORT //
6958 6888
6959 Ac3Cfg.field.AcTxop = pEdcaParm->Txop[QID_AC_VO]; 6889 Ac3Cfg.field.AcTxop = pEdcaParm->Txop[QID_AC_VO];
6960 Ac3Cfg.field.Cwmin = pEdcaParm->Cwmin[QID_AC_VO]; 6890 Ac3Cfg.field.Cwmin = pEdcaParm->Cwmin[QID_AC_VO];
@@ -6996,10 +6926,10 @@ VOID AsicSetEdcaParm(
6996 CwminCsr.field.Cwmin0 = pEdcaParm->Cwmin[QID_AC_BE]; 6926 CwminCsr.field.Cwmin0 = pEdcaParm->Cwmin[QID_AC_BE];
6997 CwminCsr.field.Cwmin1 = pEdcaParm->Cwmin[QID_AC_BK]; 6927 CwminCsr.field.Cwmin1 = pEdcaParm->Cwmin[QID_AC_BK];
6998 CwminCsr.field.Cwmin2 = pEdcaParm->Cwmin[QID_AC_VI]; 6928 CwminCsr.field.Cwmin2 = pEdcaParm->Cwmin[QID_AC_VI];
6999#ifdef CONFIG_STA_SUPPORT 6929
7000 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 6930 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
7001 CwminCsr.field.Cwmin3 = pEdcaParm->Cwmin[QID_AC_VO] - 1; //for TGn wifi test 6931 CwminCsr.field.Cwmin3 = pEdcaParm->Cwmin[QID_AC_VO] - 1; //for TGn wifi test
7002#endif // CONFIG_STA_SUPPORT // 6932
7003 RTMP_IO_WRITE32(pAd, WMM_CWMIN_CFG, CwminCsr.word); 6933 RTMP_IO_WRITE32(pAd, WMM_CWMIN_CFG, CwminCsr.word);
7004 6934
7005 CwmaxCsr.word = 0; 6935 CwmaxCsr.word = 0;
@@ -7014,7 +6944,6 @@ VOID AsicSetEdcaParm(
7014 AifsnCsr.field.Aifsn1 = Ac1Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_BK]; 6944 AifsnCsr.field.Aifsn1 = Ac1Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_BK];
7015 AifsnCsr.field.Aifsn2 = Ac2Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_VI]; 6945 AifsnCsr.field.Aifsn2 = Ac2Cfg.field.Aifsn; //pEdcaParm->Aifsn[QID_AC_VI];
7016 6946
7017#ifdef CONFIG_STA_SUPPORT
7018 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 6947 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
7019 { 6948 {
7020 // Tuning for Wi-Fi WMM S06 6949 // Tuning for Wi-Fi WMM S06
@@ -7034,9 +6963,7 @@ VOID AsicSetEdcaParm(
7034 if (INFRA_ON(pAd)) 6963 if (INFRA_ON(pAd))
7035 CLIENT_STATUS_SET_FLAG(&pAd->MacTab.Content[BSSID_WCID], fCLIENT_STATUS_WMM_CAPABLE); 6964 CLIENT_STATUS_SET_FLAG(&pAd->MacTab.Content[BSSID_WCID], fCLIENT_STATUS_WMM_CAPABLE);
7036 } 6965 }
7037#endif // CONFIG_STA_SUPPORT //
7038 6966
7039#ifdef CONFIG_STA_SUPPORT
7040 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 6967 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
7041 AifsnCsr.field.Aifsn3 = Ac3Cfg.field.Aifsn - 1; //pEdcaParm->Aifsn[QID_AC_VO]; //for TGn wifi test 6968 AifsnCsr.field.Aifsn3 = Ac3Cfg.field.Aifsn - 1; //pEdcaParm->Aifsn[QID_AC_VO]; //for TGn wifi test
7042#ifdef RT30xx 6969#ifdef RT30xx
@@ -7046,7 +6973,7 @@ VOID AsicSetEdcaParm(
7046 AifsnCsr.field.Aifsn2 = 0x2; //pEdcaParm->Aifsn[QID_AC_VI]; //for WiFi WMM S4-T04. 6973 AifsnCsr.field.Aifsn2 = 0x2; //pEdcaParm->Aifsn[QID_AC_VI]; //for WiFi WMM S4-T04.
7047 } 6974 }
7048#endif // RT30xx // 6975#endif // RT30xx //
7049#endif // CONFIG_STA_SUPPORT // 6976
7050 RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, AifsnCsr.word); 6977 RTMP_IO_WRITE32(pAd, WMM_AIFSN_CFG, AifsnCsr.word);
7051 6978
7052 NdisMoveMemory(&pAd->CommonCfg.APEdcaParm, pEdcaParm, sizeof(EDCA_PARM)); 6979 NdisMoveMemory(&pAd->CommonCfg.APEdcaParm, pEdcaParm, sizeof(EDCA_PARM));
@@ -7097,10 +7024,8 @@ VOID AsicSetSlotTime(
7097 ULONG SlotTime; 7024 ULONG SlotTime;
7098 UINT32 RegValue = 0; 7025 UINT32 RegValue = 0;
7099 7026
7100#ifdef CONFIG_STA_SUPPORT
7101 if (pAd->CommonCfg.Channel > 14) 7027 if (pAd->CommonCfg.Channel > 14)
7102 bUseShortSlotTime = TRUE; 7028 bUseShortSlotTime = TRUE;
7103#endif // CONFIG_STA_SUPPORT //
7104 7029
7105 if (bUseShortSlotTime) 7030 if (bUseShortSlotTime)
7106 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_SHORT_SLOT_INUSED); 7031 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_SHORT_SLOT_INUSED);
@@ -7109,27 +7034,23 @@ VOID AsicSetSlotTime(
7109 7034
7110 SlotTime = (bUseShortSlotTime)? 9 : 20; 7035 SlotTime = (bUseShortSlotTime)? 9 : 20;
7111 7036
7112#ifdef CONFIG_STA_SUPPORT
7113 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 7037 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
7114 { 7038 {
7115 // force using short SLOT time for FAE to demo performance when TxBurst is ON 7039 // force using short SLOT time for FAE to demo performance when TxBurst is ON
7116 if (pAd->CommonCfg.bEnableTxBurst) 7040 if (pAd->CommonCfg.bEnableTxBurst)
7117 SlotTime = 9; 7041 SlotTime = 9;
7118 } 7042 }
7119#endif // CONFIG_STA_SUPPORT //
7120 7043
7121 // 7044 //
7122 // For some reasons, always set it to short slot time. 7045 // For some reasons, always set it to short slot time.
7123 // 7046 //
7124 // ToDo: Should consider capability with 11B 7047 // ToDo: Should consider capability with 11B
7125 // 7048 //
7126#ifdef CONFIG_STA_SUPPORT
7127 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 7049 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
7128 { 7050 {
7129 if (pAd->StaCfg.BssType == BSS_ADHOC) 7051 if (pAd->StaCfg.BssType == BSS_ADHOC)
7130 SlotTime = 20; 7052 SlotTime = 20;
7131 } 7053 }
7132#endif // CONFIG_STA_SUPPORT //
7133 7054
7134 RTMP_IO_READ32(pAd, BKOFF_SLOT_CFG, &RegValue); 7055 RTMP_IO_READ32(pAd, BKOFF_SLOT_CFG, &RegValue);
7135 RegValue = RegValue & 0xFFFFFF00; 7056 RegValue = RegValue & 0xFFFFFF00;
@@ -7650,7 +7571,6 @@ VOID RTMPCheckRates(
7650 NdisMoveMemory(SupRate, NewRate, NewRateLen); 7571 NdisMoveMemory(SupRate, NewRate, NewRateLen);
7651} 7572}
7652 7573
7653#ifdef CONFIG_STA_SUPPORT
7654#ifdef DOT11_N_SUPPORT 7574#ifdef DOT11_N_SUPPORT
7655BOOLEAN RTMPCheckChannel( 7575BOOLEAN RTMPCheckChannel(
7656 IN PRTMP_ADAPTER pAd, 7576 IN PRTMP_ADAPTER pAd,
@@ -7798,7 +7718,6 @@ BOOLEAN RTMPCheckHt(
7798 return TRUE; 7718 return TRUE;
7799} 7719}
7800#endif // DOT11_N_SUPPORT // 7720#endif // DOT11_N_SUPPORT //
7801#endif // CONFIG_STA_SUPPORT //
7802 7721
7803/* 7722/*
7804 ======================================================================== 7723 ========================================================================
@@ -8047,13 +7966,11 @@ VOID AsicEvaluateRxAnt(
8047 return; 7966 return;
8048 7967
8049 7968
8050#ifdef CONFIG_STA_SUPPORT
8051 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 7969 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
8052 { 7970 {
8053 //if (pAd->StaCfg.Psm == PWR_SAVE) 7971 //if (pAd->StaCfg.Psm == PWR_SAVE)
8054 // return; 7972 // return;
8055 } 7973 }
8056#endif // CONFIG_STA_SUPPORT //
8057 7974
8058 // two antenna selection mechanism- one is antenna diversity, the other is failed antenna remove 7975 // two antenna selection mechanism- one is antenna diversity, the other is failed antenna remove
8059 // one is antenna diversity:there is only one antenna can rx and tx 7976 // one is antenna diversity:there is only one antenna can rx and tx
@@ -8078,11 +7995,8 @@ VOID AsicEvaluateRxAnt(
8078 } 7995 }
8079 else 7996 else
8080 { 7997 {
8081
8082#ifdef CONFIG_STA_SUPPORT
8083 if (pAd->StaCfg.Psm == PWR_SAVE) 7998 if (pAd->StaCfg.Psm == PWR_SAVE)
8084 return; 7999 return;
8085#endif // CONFIG_STA_SUPPORT //
8086 8000
8087 RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R3, &BBPR3); 8001 RTMP_BBP_IO_READ8_BY_REG_ID(pAd, BBP_R3, &BBPR3);
8088 BBPR3 &= (~0x18); 8002 BBPR3 &= (~0x18);
@@ -8099,8 +8013,7 @@ VOID AsicEvaluateRxAnt(
8099 BBPR3 |= (0x0); 8013 BBPR3 |= (0x0);
8100 } 8014 }
8101 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3); 8015 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3);
8102#ifdef CONFIG_STA_SUPPORT 8016
8103#endif // CONFIG_STA_SUPPORT //
8104 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED) 8017 if (OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED)
8105 ) 8018 )
8106 { 8019 {
@@ -8143,10 +8056,8 @@ VOID AsicRxAntEvalTimeout(
8143 IN PVOID SystemSpecific3) 8056 IN PVOID SystemSpecific3)
8144{ 8057{
8145 RTMP_ADAPTER *pAd = (RTMP_ADAPTER *)FunctionContext; 8058 RTMP_ADAPTER *pAd = (RTMP_ADAPTER *)FunctionContext;
8146#ifdef CONFIG_STA_SUPPORT
8147 UCHAR BBPR3 = 0; 8059 UCHAR BBPR3 = 0;
8148 CHAR larger = -127, rssi0, rssi1, rssi2; 8060 CHAR larger = -127, rssi0, rssi1, rssi2;
8149#endif // CONFIG_STA_SUPPORT //
8150 8061
8151 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS | 8062 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS |
8152 fRTMP_ADAPTER_HALT_IN_PROGRESS | 8063 fRTMP_ADAPTER_HALT_IN_PROGRESS |
@@ -8159,8 +8070,6 @@ VOID AsicRxAntEvalTimeout(
8159 ) 8070 )
8160 return; 8071 return;
8161 8072
8162
8163#ifdef CONFIG_STA_SUPPORT
8164 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 8073 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
8165 { 8074 {
8166 //if (pAd->StaCfg.Psm == PWR_SAVE) 8075 //if (pAd->StaCfg.Psm == PWR_SAVE)
@@ -8249,9 +8158,6 @@ VOID AsicRxAntEvalTimeout(
8249 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3); 8158 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3);
8250 } 8159 }
8251 } 8160 }
8252
8253#endif // CONFIG_STA_SUPPORT //
8254
8255} 8161}
8256 8162
8257 8163
@@ -8330,8 +8236,6 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
8330{ 8236{
8331 BOOLEAN result = TRUE; 8237 BOOLEAN result = TRUE;
8332 8238
8333
8334#ifdef CONFIG_STA_SUPPORT
8335 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 8239 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
8336 { 8240 {
8337 // only associated STA counts 8241 // only associated STA counts
@@ -8342,9 +8246,6 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
8342 else 8246 else
8343 result = FALSE; 8247 result = FALSE;
8344 } 8248 }
8345#endif // CONFIG_STA_SUPPORT //
8346
8347
8348 8249
8349 return result; 8250 return result;
8350} 8251}
@@ -8353,14 +8254,12 @@ BOOLEAN RTMPCheckEntryEnableAutoRateSwitch(
8353BOOLEAN RTMPAutoRateSwitchCheck( 8254BOOLEAN RTMPAutoRateSwitchCheck(
8354 IN PRTMP_ADAPTER pAd) 8255 IN PRTMP_ADAPTER pAd)
8355{ 8256{
8356
8357#ifdef CONFIG_STA_SUPPORT
8358 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 8257 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
8359 { 8258 {
8360 if (pAd->StaCfg.bAutoTxRateSwitch) 8259 if (pAd->StaCfg.bAutoTxRateSwitch)
8361 return TRUE; 8260 return TRUE;
8362 } 8261 }
8363#endif // CONFIG_STA_SUPPORT // 8262
8364 return FALSE; 8263 return FALSE;
8365} 8264}
8366 8265
@@ -8386,13 +8285,10 @@ UCHAR RTMPStaFixedTxMode(
8386{ 8285{
8387 UCHAR tx_mode = FIXED_TXMODE_HT; 8286 UCHAR tx_mode = FIXED_TXMODE_HT;
8388 8287
8389
8390#ifdef CONFIG_STA_SUPPORT
8391 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 8288 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
8392 { 8289 {
8393 tx_mode = (UCHAR)pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode; 8290 tx_mode = (UCHAR)pAd->StaCfg.DesiredTransmitSetting.field.FixedTxMode;
8394 } 8291 }
8395#endif // CONFIG_STA_SUPPORT //
8396 8292
8397 return tx_mode; 8293 return tx_mode;
8398} 8294}
@@ -8449,7 +8345,6 @@ VOID RTMPUpdateLegacyTxSetting(
8449 } 8345 }
8450} 8346}
8451 8347
8452#ifdef CONFIG_STA_SUPPORT
8453/* 8348/*
8454 ========================================================================== 8349 ==========================================================================
8455 Description: 8350 Description:
@@ -8581,7 +8476,6 @@ VOID AsicStaBbpTuning(
8581 8476
8582 } 8477 }
8583} 8478}
8584#endif // CONFIG_STA_SUPPORT //
8585 8479
8586VOID RTMPSetAGCInitValue( 8480VOID RTMPSetAGCInitValue(
8587 IN PRTMP_ADAPTER pAd, 8481 IN PRTMP_ADAPTER pAd,
diff --git a/drivers/staging/rt3070/common/rtmp_init.c b/drivers/staging/rt3070/common/rtmp_init.c
index 617476e2fe0..bcdf7b0d951 100644
--- a/drivers/staging/rt3070/common/rtmp_init.c
+++ b/drivers/staging/rt3070/common/rtmp_init.c
@@ -179,12 +179,9 @@ RTMP_REG_PAIR MACRegTable[] = {
179 {TX_TIMEOUT_CFG, 0x000a2090}, 179 {TX_TIMEOUT_CFG, 0x000a2090},
180 {MAX_LEN_CFG, MAX_AGGREGATION_SIZE | 0x00001000}, // 0x3018, MAX frame length. Max PSDU = 16kbytes. 180 {MAX_LEN_CFG, MAX_AGGREGATION_SIZE | 0x00001000}, // 0x3018, MAX frame length. Max PSDU = 16kbytes.
181 {LED_CFG, 0x7f031e46}, // Gary, 2006-08-23 181 {LED_CFG, 0x7f031e46}, // Gary, 2006-08-23
182
183//#ifdef CONFIG_STA_SUPPORT
184// {WMM_AIFSN_CFG, 0x00002273}, 182// {WMM_AIFSN_CFG, 0x00002273},
185// {WMM_CWMIN_CFG, 0x00002344}, 183// {WMM_CWMIN_CFG, 0x00002344},
186// {WMM_CWMAX_CFG, 0x000034aa}, 184// {WMM_CWMAX_CFG, 0x000034aa},
187//#endif // CONFIG_STA_SUPPORT //
188 {PBF_MAX_PCNT, 0x1F3FBF9F}, //0x1F3f7f9f}, //Jan, 2006/04/20 185 {PBF_MAX_PCNT, 0x1F3FBF9F}, //0x1F3f7f9f}, //Jan, 2006/04/20
189 //{TX_RTY_CFG, 0x6bb80408}, // Jan, 2006/11/16 186 //{TX_RTY_CFG, 0x6bb80408}, // Jan, 2006/11/16
190 {TX_RTY_CFG, 0x47d01f0f}, // Jan, 2006/11/16, Set TxWI->ACK =0 in Probe Rsp Modify for 2860E ,2007-08-03 187 {TX_RTY_CFG, 0x47d01f0f}, // Jan, 2006/11/16, Set TxWI->ACK =0 in Probe Rsp Modify for 2860E ,2007-08-03
@@ -193,9 +190,7 @@ RTMP_REG_PAIR MACRegTable[] = {
193 {OFDM_PROT_CFG, 0x05740003 /*0x01740003*/}, // Initial Auto_Responder, because QA will turn off Auto-Responder. And RTS threshold is enabled. 190 {OFDM_PROT_CFG, 0x05740003 /*0x01740003*/}, // Initial Auto_Responder, because QA will turn off Auto-Responder. And RTS threshold is enabled.
194//PS packets use Tx1Q (for HCCA) when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) 191//PS packets use Tx1Q (for HCCA) when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
195#ifdef RT2870 192#ifdef RT2870
196#ifdef CONFIG_STA_SUPPORT
197 {PBF_CFG, 0xf40006}, // Only enable Queue 2 193 {PBF_CFG, 0xf40006}, // Only enable Queue 2
198#endif // CONFIG_STA_SUPPORT //
199 {MM40_PROT_CFG, 0x3F44084}, // Initial Auto_Responder, because QA will turn off Auto-Responder 194 {MM40_PROT_CFG, 0x3F44084}, // Initial Auto_Responder, because QA will turn off Auto-Responder
200 {WPDMA_GLO_CFG, 0x00000030}, 195 {WPDMA_GLO_CFG, 0x00000030},
201#endif // RT2870 // 196#endif // RT2870 //
@@ -219,19 +214,14 @@ RTMP_REG_PAIR MACRegTable[] = {
219 {PWR_PIN_CFG, 0x00000003}, // patch for 2880-E 214 {PWR_PIN_CFG, 0x00000003}, // patch for 2880-E
220}; 215};
221 216
222
223#ifdef CONFIG_STA_SUPPORT
224RTMP_REG_PAIR STAMACRegTable[] = { 217RTMP_REG_PAIR STAMACRegTable[] = {
225 {WMM_AIFSN_CFG, 0x00002273}, 218 {WMM_AIFSN_CFG, 0x00002273},
226 {WMM_CWMIN_CFG, 0x00002344}, 219 {WMM_CWMIN_CFG, 0x00002344},
227 {WMM_CWMAX_CFG, 0x000034aa}, 220 {WMM_CWMAX_CFG, 0x000034aa},
228}; 221};
229#endif // CONFIG_STA_SUPPORT //
230 222
231#define NUM_MAC_REG_PARMS (sizeof(MACRegTable) / sizeof(RTMP_REG_PAIR)) 223#define NUM_MAC_REG_PARMS (sizeof(MACRegTable) / sizeof(RTMP_REG_PAIR))
232#ifdef CONFIG_STA_SUPPORT
233#define NUM_STA_MAC_REG_PARMS (sizeof(STAMACRegTable) / sizeof(RTMP_REG_PAIR)) 224#define NUM_STA_MAC_REG_PARMS (sizeof(STAMACRegTable) / sizeof(RTMP_REG_PAIR))
234#endif // CONFIG_STA_SUPPORT //
235 225
236#ifdef RT2870 226#ifdef RT2870
237// 227//
@@ -1558,9 +1548,6 @@ VOID NICReadEEPROMParameters(
1558 1548
1559 NicConfig2.word = pAd->EEPROMDefaultValue[1]; 1549 NicConfig2.word = pAd->EEPROMDefaultValue[1];
1560 1550
1561
1562
1563#ifdef CONFIG_STA_SUPPORT
1564 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1551 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1565 { 1552 {
1566 if ((NicConfig2.word & 0x00ff) == 0xff) 1553 if ((NicConfig2.word & 0x00ff) == 0xff)
@@ -1573,7 +1560,6 @@ VOID NICReadEEPROMParameters(
1573 NicConfig2.word &= 0x00ff; 1560 NicConfig2.word &= 0x00ff;
1574 } 1561 }
1575 } 1562 }
1576#endif // CONFIG_STA_SUPPORT //
1577 1563
1578 if (NicConfig2.field.DynamicTxAgcControl == 1) 1564 if (NicConfig2.field.DynamicTxAgcControl == 1)
1579 pAd->bAutoTxAgcA = pAd->bAutoTxAgcG = TRUE; 1565 pAd->bAutoTxAgcA = pAd->bAutoTxAgcG = TRUE;
@@ -1792,10 +1778,8 @@ VOID NICReadEEPROMParameters(
1792VOID NICInitAsicFromEEPROM( 1778VOID NICInitAsicFromEEPROM(
1793 IN PRTMP_ADAPTER pAd) 1779 IN PRTMP_ADAPTER pAd)
1794{ 1780{
1795#ifdef CONFIG_STA_SUPPORT
1796 UINT32 data = 0; 1781 UINT32 data = 0;
1797 UCHAR BBPR1 = 0; 1782 UCHAR BBPR1 = 0;
1798#endif // CONFIG_STA_SUPPORT //
1799 USHORT i; 1783 USHORT i;
1800 EEPROM_ANTENNA_STRUC Antenna; 1784 EEPROM_ANTENNA_STRUC Antenna;
1801 EEPROM_NIC_CONFIG2_STRUC NicConfig2; 1785 EEPROM_NIC_CONFIG2_STRUC NicConfig2;
@@ -1830,8 +1814,6 @@ VOID NICInitAsicFromEEPROM(
1830 1814
1831 NicConfig2.word = pAd->EEPROMDefaultValue[1]; 1815 NicConfig2.word = pAd->EEPROMDefaultValue[1];
1832 1816
1833
1834#ifdef CONFIG_STA_SUPPORT
1835 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1817 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1836 { 1818 {
1837 if ((NicConfig2.word & 0x00ff) == 0xff) 1819 if ((NicConfig2.word & 0x00ff) == 0xff)
@@ -1844,7 +1826,6 @@ VOID NICInitAsicFromEEPROM(
1844 NicConfig2.word &= 0x00ff; 1826 NicConfig2.word &= 0x00ff;
1845 } 1827 }
1846 } 1828 }
1847#endif // CONFIG_STA_SUPPORT //
1848 1829
1849 // Save the antenna for future use 1830 // Save the antenna for future use
1850 pAd->NicConfig2.word = NicConfig2.word; 1831 pAd->NicConfig2.word = NicConfig2.word;
@@ -1873,7 +1854,6 @@ VOID NICInitAsicFromEEPROM(
1873 pAd->LedIndicatorStregth = 0xFF; 1854 pAd->LedIndicatorStregth = 0xFF;
1874 RTMPSetSignalLED(pAd, -100); // Force signal strength Led to be turned off, before link up 1855 RTMPSetSignalLED(pAd, -100); // Force signal strength Led to be turned off, before link up
1875 1856
1876#ifdef CONFIG_STA_SUPPORT
1877 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1857 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1878 { 1858 {
1879 // Read Hardware controlled Radio state enable bit 1859 // Read Hardware controlled Radio state enable bit
@@ -1903,7 +1883,6 @@ VOID NICInitAsicFromEEPROM(
1903 RTMPSetLED(pAd, LED_RADIO_ON); 1883 RTMPSetLED(pAd, LED_RADIO_ON);
1904 } 1884 }
1905 } 1885 }
1906#endif // CONFIG_STA_SUPPORT //
1907 1886
1908 // Turn off patching for cardbus controller 1887 // Turn off patching for cardbus controller
1909 if (NicConfig2.field.CardbusAcceleration == 1) 1888 if (NicConfig2.field.CardbusAcceleration == 1)
@@ -1937,7 +1916,6 @@ VOID NICInitAsicFromEEPROM(
1937 } 1916 }
1938 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3); 1917 RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R3, BBPR3);
1939 1918
1940#ifdef CONFIG_STA_SUPPORT
1941 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1919 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1942 { 1920 {
1943 // Handle the difference when 1T 1921 // Handle the difference when 1T
@@ -1950,7 +1928,7 @@ VOID NICInitAsicFromEEPROM(
1950 1928
1951 DBGPRINT(RT_DEBUG_TRACE, ("Use Hw Radio Control Pin=%d; if used Pin=%d;\n", pAd->CommonCfg.bHardwareRadio, pAd->CommonCfg.bHardwareRadio)); 1929 DBGPRINT(RT_DEBUG_TRACE, ("Use Hw Radio Control Pin=%d; if used Pin=%d;\n", pAd->CommonCfg.bHardwareRadio, pAd->CommonCfg.bHardwareRadio));
1952 } 1930 }
1953#endif // CONFIG_STA_SUPPORT // 1931
1954 DBGPRINT(RT_DEBUG_TRACE, ("TxPath = %d, RxPath = %d, RFIC=%d, Polar+LED mode=%x\n", pAd->Antenna.field.TxPath, pAd->Antenna.field.RxPath, pAd->RfIcType, pAd->LedCntl.word)); 1932 DBGPRINT(RT_DEBUG_TRACE, ("TxPath = %d, RxPath = %d, RFIC=%d, Polar+LED mode=%x\n", pAd->Antenna.field.TxPath, pAd->Antenna.field.RxPath, pAd->RfIcType, pAd->LedCntl.word));
1955 DBGPRINT(RT_DEBUG_TRACE, ("<-- NICInitAsicFromEEPROM\n")); 1933 DBGPRINT(RT_DEBUG_TRACE, ("<-- NICInitAsicFromEEPROM\n"));
1956} 1934}
@@ -2142,7 +2120,6 @@ NDIS_STATUS NICInitializeAsic(
2142 } 2120 }
2143 2121
2144 2122
2145#ifdef CONFIG_STA_SUPPORT
2146 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2123 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2147 { 2124 {
2148 for (Index = 0; Index < NUM_STA_MAC_REG_PARMS; Index++) 2125 for (Index = 0; Index < NUM_STA_MAC_REG_PARMS; Index++)
@@ -2150,7 +2127,6 @@ NDIS_STATUS NICInitializeAsic(
2150 RTMP_IO_WRITE32(pAd, (USHORT)STAMACRegTable[Index].Register, STAMACRegTable[Index].Value); 2127 RTMP_IO_WRITE32(pAd, (USHORT)STAMACRegTable[Index].Register, STAMACRegTable[Index].Value);
2151 } 2128 }
2152 } 2129 }
2153#endif // CONFIG_STA_SUPPORT //
2154#endif // RT2870 // 2130#endif // RT2870 //
2155 2131
2156#ifdef RT30xx 2132#ifdef RT30xx
@@ -2302,7 +2278,6 @@ NDIS_STATUS NICInitializeAsic(
2302#endif // RT2870 // 2278#endif // RT2870 //
2303 2279
2304 // Add radio off control 2280 // Add radio off control
2305#ifdef CONFIG_STA_SUPPORT
2306 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2281 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2307 { 2282 {
2308 if (pAd->StaCfg.bRadio == FALSE) 2283 if (pAd->StaCfg.bRadio == FALSE)
@@ -2312,7 +2287,6 @@ NDIS_STATUS NICInitializeAsic(
2312 DBGPRINT(RT_DEBUG_TRACE, ("Set Radio Off\n")); 2287 DBGPRINT(RT_DEBUG_TRACE, ("Set Radio Off\n"));
2313 } 2288 }
2314 } 2289 }
2315#endif // CONFIG_STA_SUPPORT //
2316 2290
2317 // Clear raw counters 2291 // Clear raw counters
2318 RTMP_IO_READ32(pAd, RX_STA_CNT0, &Counter); 2292 RTMP_IO_READ32(pAd, RX_STA_CNT0, &Counter);
@@ -2383,14 +2357,12 @@ NDIS_STATUS NICInitializeAsic(
2383 } 2357 }
2384#endif // RT30xx // 2358#endif // RT30xx //
2385 2359
2386#ifdef CONFIG_STA_SUPPORT
2387 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 2360 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
2388 { 2361 {
2389 // for rt2860E and after, init TXOP_CTRL_CFG with 0x583f. This is for extension channel overlapping IOT. 2362 // for rt2860E and after, init TXOP_CTRL_CFG with 0x583f. This is for extension channel overlapping IOT.
2390 if ((pAd->MACVersion&0xffff) != 0x0101) 2363 if ((pAd->MACVersion&0xffff) != 0x0101)
2391 RTMP_IO_WRITE32(pAd, TXOP_CTRL_CFG, 0x583f); 2364 RTMP_IO_WRITE32(pAd, TXOP_CTRL_CFG, 0x583f);
2392 } 2365 }
2393#endif // CONFIG_STA_SUPPORT //
2394 2366
2395 DBGPRINT(RT_DEBUG_TRACE, ("<-- NICInitializeAsic\n")); 2367 DBGPRINT(RT_DEBUG_TRACE, ("<-- NICInitializeAsic\n"));
2396 return NDIS_STATUS_SUCCESS; 2368 return NDIS_STATUS_SUCCESS;
@@ -3336,7 +3308,6 @@ VOID UserCfgInit(
3336 // 3308 //
3337 // part II. intialize STA specific configuration 3309 // part II. intialize STA specific configuration
3338 // 3310 //
3339#ifdef CONFIG_STA_SUPPORT
3340 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3311 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3341 { 3312 {
3342 RX_FILTER_SET_FLAG(pAd, fRX_FILTER_ACCEPT_DIRECT); 3313 RX_FILTER_SET_FLAG(pAd, fRX_FILTER_ACCEPT_DIRECT);
@@ -3375,7 +3346,6 @@ VOID UserCfgInit(
3375 pAd->StaCfg.bAutoTxRateSwitch = TRUE; 3346 pAd->StaCfg.bAutoTxRateSwitch = TRUE;
3376 pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO; 3347 pAd->StaCfg.DesiredTransmitSetting.field.MCS = MCS_AUTO;
3377 } 3348 }
3378#endif // CONFIG_STA_SUPPORT //
3379 3349
3380 // global variables mXXXX used in MAC protocol state machines 3350 // global variables mXXXX used in MAC protocol state machines
3381 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_RECEIVE_DTIM); 3351 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_RECEIVE_DTIM);
@@ -3386,7 +3356,6 @@ VOID UserCfgInit(
3386 pAd->CommonCfg.PhyMode = PHY_11BG_MIXED; // default PHY mode 3356 pAd->CommonCfg.PhyMode = PHY_11BG_MIXED; // default PHY mode
3387 OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_SHORT_PREAMBLE_INUSED); // CCK use LONG preamble 3357 OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_SHORT_PREAMBLE_INUSED); // CCK use LONG preamble
3388 3358
3389#ifdef CONFIG_STA_SUPPORT
3390 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 3359 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
3391 { 3360 {
3392 // user desired power mode 3361 // user desired power mode
@@ -3431,7 +3400,6 @@ VOID UserCfgInit(
3431#endif // WPA_SUPPLICANT_SUPPORT // 3400#endif // WPA_SUPPLICANT_SUPPORT //
3432 3401
3433 } 3402 }
3434#endif // CONFIG_STA_SUPPORT //
3435 3403
3436 // Default for extra information is not valid 3404 // Default for extra information is not valid
3437 pAd->ExtraInfo = EXTRA_INFO_CLEAR; 3405 pAd->ExtraInfo = EXTRA_INFO_CLEAR;
diff --git a/drivers/staging/rt3070/common/rtmp_tkip.c b/drivers/staging/rt3070/common/rtmp_tkip.c
index 27e4277152d..da301aef089 100644
--- a/drivers/staging/rt3070/common/rtmp_tkip.c
+++ b/drivers/staging/rt3070/common/rtmp_tkip.c
@@ -691,9 +691,6 @@ VOID RTMPCalculateMICValue(
691 // determine if this is a vlan packet 691 // determine if this is a vlan packet
692 if (((*(pSrc + 12) << 8) + *(pSrc + 13)) == 0x8100) 692 if (((*(pSrc + 12) << 8) + *(pSrc + 13)) == 0x8100)
693 vlan_offset = 4; 693 vlan_offset = 4;
694
695#ifdef CONFIG_STA_SUPPORT
696#endif // CONFIG_STA_SUPPORT //
697 { 694 {
698 RTMPInitMICEngine( 695 RTMPInitMICEngine(
699 pAd, 696 pAd,
diff --git a/drivers/staging/rt3070/common/rtmp_wep.c b/drivers/staging/rt3070/common/rtmp_wep.c
index f5f0a3bb17e..28dedda8be9 100644
--- a/drivers/staging/rt3070/common/rtmp_wep.c
+++ b/drivers/staging/rt3070/common/rtmp_wep.c
@@ -153,14 +153,12 @@ VOID RTMPInitWepEngine(
153 153
154 pAd->PrivateInfo.FCSCRC32 = PPPINITFCS32; //Init crc32. 154 pAd->PrivateInfo.FCSCRC32 = PPPINITFCS32; //Init crc32.
155 155
156#ifdef CONFIG_STA_SUPPORT
157 if (pAd->StaCfg.bCkipOn && (pAd->StaCfg.CkipFlag & 0x10) && (pAd->OpMode == OPMODE_STA)) 156 if (pAd->StaCfg.bCkipOn && (pAd->StaCfg.CkipFlag & 0x10) && (pAd->OpMode == OPMODE_STA))
158 { 157 {
159 ARCFOUR_INIT(&pAd->PrivateInfo.WEPCONTEXT, pKey, KeyLen); //INIT SBOX, KEYLEN+3(IV) 158 ARCFOUR_INIT(&pAd->PrivateInfo.WEPCONTEXT, pKey, KeyLen); //INIT SBOX, KEYLEN+3(IV)
160 NdisMoveMemory(pDest, pKey, 3); //Append Init Vector 159 NdisMoveMemory(pDest, pKey, 3); //Append Init Vector
161 } 160 }
162 else 161 else
163#endif // CONFIG_STA_SUPPORT //
164 { 162 {
165 NdisMoveMemory(WEPKEY + 3, pKey, KeyLen); 163 NdisMoveMemory(WEPKEY + 3, pKey, KeyLen);
166 164
diff --git a/drivers/staging/rt3070/common/rtusb_bulk.c b/drivers/staging/rt3070/common/rtusb_bulk.c
index 912b50e9903..2fce09bf7e5 100644
--- a/drivers/staging/rt3070/common/rtusb_bulk.c
+++ b/drivers/staging/rt3070/common/rtusb_bulk.c
@@ -319,7 +319,6 @@ VOID RTUSBBulkOutDataPacket(
319 break; 319 break;
320 } 320 }
321 //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) 321 //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
322#ifdef CONFIG_STA_SUPPORT
323 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 322 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
324 { 323 {
325 if (pTxInfo->QSEL != FIFO_EDCA) 324 if (pTxInfo->QSEL != FIFO_EDCA)
@@ -329,7 +328,6 @@ VOID RTUSBBulkOutDataPacket(
329 hex_dump("Wrong QSel Pkt:", (PUCHAR)&pWirelessPkt[TmpBulkEndPos], (pHTTXContext->CurWritePosition - pHTTXContext->NextBulkOutPosition)); 328 hex_dump("Wrong QSel Pkt:", (PUCHAR)&pWirelessPkt[TmpBulkEndPos], (pHTTXContext->CurWritePosition - pHTTXContext->NextBulkOutPosition));
330 } 329 }
331 } 330 }
332#endif // CONFIG_STA_SUPPORT //
333 331
334 if (pTxInfo->USBDMATxPktLen <= 8) 332 if (pTxInfo->USBDMATxPktLen <= 8)
335 { 333 {
@@ -356,10 +354,8 @@ VOID RTUSBBulkOutDataPacket(
356 pLastTxInfo = pTxInfo; 354 pLastTxInfo = pTxInfo;
357 355
358 // Make sure we use EDCA QUEUE. 356 // Make sure we use EDCA QUEUE.
359#ifdef CONFIG_STA_SUPPORT
360 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 357 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
361 pTxInfo->QSEL = FIFO_EDCA; //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA) 358 pTxInfo->QSEL = FIFO_EDCA; //PS packets use HCCA queue when dequeue from PS unicast queue (WiFi WPA2 MA9_DT1 for Marvell B STA)
362#endif // CONFIG_STA_SUPPORT //
363 ThisBulkSize += (pTxInfo->USBDMATxPktLen+4); 359 ThisBulkSize += (pTxInfo->USBDMATxPktLen+4);
364 TmpBulkEndPos += (pTxInfo->USBDMATxPktLen+4); 360 TmpBulkEndPos += (pTxInfo->USBDMATxPktLen+4);
365 361
@@ -846,10 +842,8 @@ VOID RTUSBBulkReceive(
846 RTMP_IRQ_UNLOCK(&pAd->BulkInLock, IrqFlags); 842 RTMP_IRQ_UNLOCK(&pAd->BulkInLock, IrqFlags);
847 843
848 // read RxContext, Since not 844 // read RxContext, Since not
849#ifdef CONFIG_STA_SUPPORT
850 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 845 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
851 STARxDoneInterruptHandle(pAd, TRUE); 846 STARxDoneInterruptHandle(pAd, TRUE);
852#endif // CONFIG_STA_SUPPORT //
853 847
854 // Finish to handle this bulkIn buffer. 848 // Finish to handle this bulkIn buffer.
855 RTMP_IRQ_LOCK(&pAd->BulkInLock, IrqFlags); 849 RTMP_IRQ_LOCK(&pAd->BulkInLock, IrqFlags);
diff --git a/drivers/staging/rt3070/common/rtusb_io.c b/drivers/staging/rt3070/common/rtusb_io.c
index 0f3e57efe55..d7c024401c3 100644
--- a/drivers/staging/rt3070/common/rtusb_io.c
+++ b/drivers/staging/rt3070/common/rtusb_io.c
@@ -1195,12 +1195,7 @@ VOID CMDHandler(
1195 { 1195 {
1196 case CMDTHREAD_CHECK_GPIO: 1196 case CMDTHREAD_CHECK_GPIO:
1197 { 1197 {
1198#ifdef CONFIG_STA_SUPPORT
1199 UINT32 data; 1198 UINT32 data;
1200#endif // CONFIG_STA_SUPPORT //
1201
1202#ifdef CONFIG_STA_SUPPORT
1203
1204 1199
1205 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1200 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1206 { 1201 {
@@ -1238,17 +1233,14 @@ VOID CMDHandler(
1238 } 1233 }
1239 } 1234 }
1240 } 1235 }
1241#endif // CONFIG_STA_SUPPORT //
1242 } 1236 }
1243 break; 1237 break;
1244 1238
1245#ifdef CONFIG_STA_SUPPORT
1246 case CMDTHREAD_QKERIODIC_EXECUT: 1239 case CMDTHREAD_QKERIODIC_EXECUT:
1247 { 1240 {
1248 StaQuickResponeForRateUpExec(NULL, pAd, NULL, NULL); 1241 StaQuickResponeForRateUpExec(NULL, pAd, NULL, NULL);
1249 } 1242 }
1250 break; 1243 break;
1251#endif // CONFIG_STA_SUPPORT //
1252 1244
1253 case CMDTHREAD_RESET_BULK_OUT: 1245 case CMDTHREAD_RESET_BULK_OUT:
1254 { 1246 {
@@ -1578,7 +1570,6 @@ VOID CMDHandler(
1578 1570
1579 case CMDTHREAD_SET_ASIC_WCID_CIPHER: 1571 case CMDTHREAD_SET_ASIC_WCID_CIPHER:
1580 { 1572 {
1581#ifdef CONFIG_STA_SUPPORT
1582 RT_SET_ASIC_WCID_ATTRI SetAsicWcidAttri; 1573 RT_SET_ASIC_WCID_ATTRI SetAsicWcidAttri;
1583 USHORT offset; 1574 USHORT offset;
1584 UINT32 MACRValue = 0; 1575 UINT32 MACRValue = 0;
@@ -1630,7 +1621,6 @@ VOID CMDHandler(
1630 1621
1631 RTUSBWriteMACRegister(pAd, SHARED_KEY_MODE_BASE+4*(0/2), csr1.word); 1622 RTUSBWriteMACRegister(pAd, SHARED_KEY_MODE_BASE+4*(0/2), csr1.word);
1632 } 1623 }
1633#endif // CONFIG_STA_SUPPORT //
1634 } 1624 }
1635 break; 1625 break;
1636 1626
@@ -1669,8 +1659,6 @@ VOID CMDHandler(
1669 MAC_TABLE_ENTRY *pEntry; 1659 MAC_TABLE_ENTRY *pEntry;
1670 pEntry = (MAC_TABLE_ENTRY *)pData; 1660 pEntry = (MAC_TABLE_ENTRY *)pData;
1671 1661
1672
1673#ifdef CONFIG_STA_SUPPORT
1674 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1662 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1675 { 1663 {
1676 AsicRemovePairwiseKeyEntry(pAd, pEntry->apidx, (UCHAR)pEntry->Aid); 1664 AsicRemovePairwiseKeyEntry(pAd, pEntry->apidx, (UCHAR)pEntry->Aid);
@@ -1706,7 +1694,6 @@ VOID CMDHandler(
1706 RTUSBWriteMACRegister(pAd, offset, 0); 1694 RTUSBWriteMACRegister(pAd, offset, 0);
1707 } 1695 }
1708 } 1696 }
1709#endif // CONFIG_STA_SUPPORT //
1710 1697
1711 AsicUpdateRxWCIDTable(pAd, pEntry->Aid, pEntry->Addr); 1698 AsicUpdateRxWCIDTable(pAd, pEntry->Aid, pEntry->Addr);
1712 printk("UpdateRxWCIDTable(): Aid=%d, Addr=%02x:%02x:%02x:%02x:%02x:%02x!\n", pEntry->Aid, 1699 printk("UpdateRxWCIDTable(): Aid=%d, Addr=%02x:%02x:%02x:%02x:%02x:%02x!\n", pEntry->Aid,
@@ -1724,7 +1711,6 @@ VOID CMDHandler(
1724 1711
1725 case OID_802_11_ADD_WEP: 1712 case OID_802_11_ADD_WEP:
1726 { 1713 {
1727#ifdef CONFIG_STA_SUPPORT
1728 UINT i; 1714 UINT i;
1729 UINT32 KeyIdx; 1715 UINT32 KeyIdx;
1730 PNDIS_802_11_WEP pWepKey; 1716 PNDIS_802_11_WEP pWepKey;
@@ -1798,7 +1784,6 @@ VOID CMDHandler(
1798 AsicAddSharedKeyEntry(pAd, BSS0, (UCHAR)KeyIdx, CipherAlg, pWepKey->KeyMaterial, NULL, NULL); 1784 AsicAddSharedKeyEntry(pAd, BSS0, (UCHAR)KeyIdx, CipherAlg, pWepKey->KeyMaterial, NULL, NULL);
1799 DBGPRINT(RT_DEBUG_TRACE, ("CmdThread::OID_802_11_ADD_WEP (KeyIdx=%d, Len=%d-byte)\n", KeyIdx, pWepKey->KeyLength)); 1785 DBGPRINT(RT_DEBUG_TRACE, ("CmdThread::OID_802_11_ADD_WEP (KeyIdx=%d, Len=%d-byte)\n", KeyIdx, pWepKey->KeyLength));
1800 } 1786 }
1801#endif // CONFIG_STA_SUPPORT //
1802 } 1787 }
1803 break; 1788 break;
1804 1789
diff --git a/drivers/staging/rt3070/common/spectrum.c b/drivers/staging/rt3070/common/spectrum.c
index 2762b57dd14..039f2c69305 100644
--- a/drivers/staging/rt3070/common/spectrum.c
+++ b/drivers/staging/rt3070/common/spectrum.c
@@ -1453,10 +1453,8 @@ static VOID PeerChSwAnnAction(
1453{ 1453{
1454 CH_SW_ANN_INFO ChSwAnnInfo; 1454 CH_SW_ANN_INFO ChSwAnnInfo;
1455 PFRAME_802_11 pFr = (PFRAME_802_11)Elem->Msg; 1455 PFRAME_802_11 pFr = (PFRAME_802_11)Elem->Msg;
1456#ifdef CONFIG_STA_SUPPORT
1457 UCHAR index = 0, Channel = 0, NewChannel = 0; 1456 UCHAR index = 0, Channel = 0, NewChannel = 0;
1458 ULONG Bssidx = 0; 1457 ULONG Bssidx = 0;
1459#endif // CONFIG_STA_SUPPORT //
1460 1458
1461 NdisZeroMemory(&ChSwAnnInfo, sizeof(CH_SW_ANN_INFO)); 1459 NdisZeroMemory(&ChSwAnnInfo, sizeof(CH_SW_ANN_INFO));
1462 if (! PeerChSwAnnSanity(pAd, Elem->Msg, Elem->MsgLen, &ChSwAnnInfo)) 1460 if (! PeerChSwAnnSanity(pAd, Elem->Msg, Elem->MsgLen, &ChSwAnnInfo))
@@ -1465,8 +1463,6 @@ static VOID PeerChSwAnnAction(
1465 return; 1463 return;
1466 } 1464 }
1467 1465
1468
1469#ifdef CONFIG_STA_SUPPORT
1470 if (pAd->OpMode == OPMODE_STA) 1466 if (pAd->OpMode == OPMODE_STA)
1471 { 1467 {
1472 Bssidx = BssTableSearch(&pAd->ScanTab, pFr->Hdr.Addr3, pAd->CommonCfg.Channel); 1468 Bssidx = BssTableSearch(&pAd->ScanTab, pFr->Hdr.Addr3, pAd->CommonCfg.Channel);
@@ -1513,7 +1509,6 @@ static VOID PeerChSwAnnAction(
1513 } 1509 }
1514 } 1510 }
1515 } 1511 }
1516#endif // CONFIG_STA_SUPPORT //
1517 1512
1518 return; 1513 return;
1519} 1514}
diff --git a/drivers/staging/rt3070/mlme.h b/drivers/staging/rt3070/mlme.h
index 56c0d41826c..d8dcfcdd143 100644
--- a/drivers/staging/rt3070/mlme.h
+++ b/drivers/staging/rt3070/mlme.h
@@ -77,12 +77,9 @@
77#define FAST_ACTIVE_SCAN_TIME 30 // Active scan waiting for probe response time 77#define FAST_ACTIVE_SCAN_TIME 30 // Active scan waiting for probe response time
78#define CW_MIN_IN_BITS 4 // actual CwMin = 2^CW_MIN_IN_BITS - 1 78#define CW_MIN_IN_BITS 4 // actual CwMin = 2^CW_MIN_IN_BITS - 1
79 79
80
81#ifdef CONFIG_STA_SUPPORT
82#ifndef CONFIG_AP_SUPPORT 80#ifndef CONFIG_AP_SUPPORT
83#define CW_MAX_IN_BITS 10 // actual CwMax = 2^CW_MAX_IN_BITS - 1 81#define CW_MAX_IN_BITS 10 // actual CwMax = 2^CW_MAX_IN_BITS - 1
84#endif 82#endif
85#endif // CONFIG_STA_SUPPORT //
86 83
87// Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720). 84// Note: RSSI_TO_DBM_OFFSET has been changed to variable for new RF (2004-0720).
88// SHould not refer to this constant anymore 85// SHould not refer to this constant anymore
@@ -121,10 +118,7 @@
121 118
122#define BSS_NOT_FOUND 0xFFFFFFFF 119#define BSS_NOT_FOUND 0xFFFFFFFF
123 120
124
125#ifdef CONFIG_STA_SUPPORT
126#define MAX_LEN_OF_MLME_QUEUE 40 //10 121#define MAX_LEN_OF_MLME_QUEUE 40 //10
127#endif // CONFIG_STA_SUPPORT //
128 122
129#define SCAN_PASSIVE 18 // scan with no probe request, only wait beacon and probe response 123#define SCAN_PASSIVE 18 // scan with no probe request, only wait beacon and probe response
130#define SCAN_ACTIVE 19 // scan with probe request, and wait beacon and probe response 124#define SCAN_ACTIVE 19 // scan with probe request, and wait beacon and probe response
@@ -855,13 +849,10 @@ typedef struct {
855 UCHAR EdcaUpdateCount; 849 UCHAR EdcaUpdateCount;
856} QOS_CAPABILITY_PARM, *PQOS_CAPABILITY_PARM; 850} QOS_CAPABILITY_PARM, *PQOS_CAPABILITY_PARM;
857 851
858#ifdef CONFIG_STA_SUPPORT
859typedef struct { 852typedef struct {
860 UCHAR IELen; 853 UCHAR IELen;
861 UCHAR IE[MAX_CUSTOM_LEN]; 854 UCHAR IE[MAX_CUSTOM_LEN];
862} WPA_IE_; 855} WPA_IE_;
863#endif // CONFIG_STA_SUPPORT //
864
865 856
866typedef struct { 857typedef struct {
867 UCHAR Bssid[MAC_ADDR_LEN]; 858 UCHAR Bssid[MAC_ADDR_LEN];
@@ -921,10 +912,8 @@ typedef struct {
921 EDCA_PARM EdcaParm; 912 EDCA_PARM EdcaParm;
922 QOS_CAPABILITY_PARM QosCapability; 913 QOS_CAPABILITY_PARM QosCapability;
923 QBSS_LOAD_PARM QbssLoad; 914 QBSS_LOAD_PARM QbssLoad;
924#ifdef CONFIG_STA_SUPPORT
925 WPA_IE_ WpaIE; 915 WPA_IE_ WpaIE;
926 WPA_IE_ RsnIE; 916 WPA_IE_ RsnIE;
927#endif // CONFIG_STA_SUPPORT //
928} BSS_ENTRY, *PBSS_ENTRY; 917} BSS_ENTRY, *PBSS_ENTRY;
929 918
930typedef struct { 919typedef struct {
diff --git a/drivers/staging/rt3070/oid.h b/drivers/staging/rt3070/oid.h
index a7fc23809f5..506f3c122a8 100644
--- a/drivers/staging/rt3070/oid.h
+++ b/drivers/staging/rt3070/oid.h
@@ -387,9 +387,6 @@ typedef struct PACKED _RADIUS_CONF
387 RADIUS_KEY_INFO RadiusInfo[8/*MAX_MBSSID_NUM*/]; 387 RADIUS_KEY_INFO RadiusInfo[8/*MAX_MBSSID_NUM*/];
388} RADIUS_CONF, *PRADIUS_CONF; 388} RADIUS_CONF, *PRADIUS_CONF;
389 389
390
391
392#ifdef CONFIG_STA_SUPPORT
393// Key mapping keys require a BSSID 390// Key mapping keys require a BSSID
394typedef struct _NDIS_802_11_KEY 391typedef struct _NDIS_802_11_KEY
395{ 392{
@@ -400,7 +397,6 @@ typedef struct _NDIS_802_11_KEY
400 NDIS_802_11_KEY_RSC KeyRSC; 397 NDIS_802_11_KEY_RSC KeyRSC;
401 UCHAR KeyMaterial[1]; // variable length depending on above field 398 UCHAR KeyMaterial[1]; // variable length depending on above field
402} NDIS_802_11_KEY, *PNDIS_802_11_KEY; 399} NDIS_802_11_KEY, *PNDIS_802_11_KEY;
403#endif // CONFIG_STA_SUPPORT //
404 400
405typedef struct _NDIS_802_11_REMOVE_KEY 401typedef struct _NDIS_802_11_REMOVE_KEY
406{ 402{
@@ -615,7 +611,6 @@ typedef enum _NDIS_802_11_MEDIA_STREAM_MODE
615// PMKID Structures 611// PMKID Structures
616typedef UCHAR NDIS_802_11_PMKID_VALUE[16]; 612typedef UCHAR NDIS_802_11_PMKID_VALUE[16];
617 613
618#ifdef CONFIG_STA_SUPPORT
619typedef struct _BSSID_INFO 614typedef struct _BSSID_INFO
620{ 615{
621 NDIS_802_11_MAC_ADDRESS BSSID; 616 NDIS_802_11_MAC_ADDRESS BSSID;
@@ -628,8 +623,6 @@ typedef struct _NDIS_802_11_PMKID
628 UINT BSSIDInfoCount; 623 UINT BSSIDInfoCount;
629 BSSID_INFO BSSIDInfo[1]; 624 BSSID_INFO BSSIDInfo[1];
630} NDIS_802_11_PMKID, *PNDIS_802_11_PMKID; 625} NDIS_802_11_PMKID, *PNDIS_802_11_PMKID;
631#endif // CONFIG_STA_SUPPORT //
632
633 626
634typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION 627typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION
635{ 628{
@@ -653,7 +646,6 @@ typedef struct _NDIS_802_11_CAPABILITY
653#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE 646#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
654#endif 647#endif
655 648
656#ifdef CONFIG_STA_SUPPORT
657#define RT_PRIV_IOCTL_EXT (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon 649#define RT_PRIV_IOCTL_EXT (SIOCIWFIRSTPRIV + 0x01) // Sync. with AP for wsc upnp daemon
658#define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02) 650#define RTPRIV_IOCTL_SET (SIOCIWFIRSTPRIV + 0x02)
659 651
@@ -686,11 +678,6 @@ enum {
686 SHOW_CFG_VALUE = 20, 678 SHOW_CFG_VALUE = 20,
687}; 679};
688 680
689
690#endif // CONFIG_STA_SUPPORT //
691
692
693
694#define OID_802_11_BUILD_CHANNEL_EX 0x0714 681#define OID_802_11_BUILD_CHANNEL_EX 0x0714
695#define OID_802_11_GET_CH_LIST 0x0715 682#define OID_802_11_GET_CH_LIST 0x0715
696#define OID_802_11_GET_COUNTRY_CODE 0x0716 683#define OID_802_11_GET_COUNTRY_CODE 0x0716
@@ -698,7 +685,6 @@ enum {
698 685
699//#define RT_OID_802_11_STATISTICS (OID_GET_SET_TOGGLE | OID_802_11_STATISTICS) 686//#define RT_OID_802_11_STATISTICS (OID_GET_SET_TOGGLE | OID_802_11_STATISTICS)
700 687
701#ifdef CONFIG_STA_SUPPORT
702#define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk 688#define RT_OID_WSC_SET_PASSPHRASE 0x0740 // passphrase for wpa(2)-psk
703#define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741 689#define RT_OID_WSC_DRIVER_AUTO_CONNECT 0x0741
704#define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742 690#define RT_OID_WSC_QUERY_DEFAULT_PROFILE 0x0742
@@ -709,7 +695,7 @@ enum {
709#define RT_OID_WSC_SET_MODE 0x0747 // PIN or PBC 695#define RT_OID_WSC_SET_MODE 0x0747 // PIN or PBC
710#define RT_OID_WSC_SET_CONF_MODE 0x0748 // Enrollee or Registrar 696#define RT_OID_WSC_SET_CONF_MODE 0x0748 // Enrollee or Registrar
711#define RT_OID_WSC_SET_PROFILE 0x0749 697#define RT_OID_WSC_SET_PROFILE 0x0749
712#endif // CONFIG_STA_SUPPORT // 698
713#define RT_OID_802_11_WSC_QUERY_PROFILE 0x0750 699#define RT_OID_802_11_WSC_QUERY_PROFILE 0x0750
714// for consistency with RT61 700// for consistency with RT61
715#define RT_OID_WSC_QUERY_STATUS 0x0751 701#define RT_OID_WSC_QUERY_STATUS 0x0751
@@ -948,7 +934,6 @@ typedef struct _RT_LLTD_ASSOICATION_TABLE {
948} RT_LLTD_ASSOICATION_TABLE, *PRT_LLTD_ASSOICATION_TABLE; 934} RT_LLTD_ASSOICATION_TABLE, *PRT_LLTD_ASSOICATION_TABLE;
949#endif // LLTD_SUPPORT // 935#endif // LLTD_SUPPORT //
950 936
951#ifdef CONFIG_STA_SUPPORT
952#ifdef WPA_SUPPLICANT_SUPPORT 937#ifdef WPA_SUPPLICANT_SUPPORT
953#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT 938#ifndef NATIVE_WPA_SUPPLICANT_SUPPORT
954#define RT_ASSOC_EVENT_FLAG 0x0101 939#define RT_ASSOC_EVENT_FLAG 0x0101
@@ -961,19 +946,15 @@ typedef struct _RT_LLTD_ASSOICATION_TABLE {
961#define RT_INTERFACE_UP 0x0108 946#define RT_INTERFACE_UP 0x0108
962#endif // NATIVE_WPA_SUPPLICANT_SUPPORT // 947#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
963#endif // WPA_SUPPLICANT_SUPPORT // 948#endif // WPA_SUPPLICANT_SUPPORT //
964#endif // CONFIG_STA_SUPPORT //
965
966 949
967#define MAX_CUSTOM_LEN 128 950#define MAX_CUSTOM_LEN 128
968 951
969#ifdef CONFIG_STA_SUPPORT
970typedef enum _RT_802_11_D_CLIENT_MODE 952typedef enum _RT_802_11_D_CLIENT_MODE
971{ 953{
972 Rt802_11_D_None, 954 Rt802_11_D_None,
973 Rt802_11_D_Flexible, 955 Rt802_11_D_Flexible,
974 Rt802_11_D_Strict, 956 Rt802_11_D_Strict,
975} RT_802_11_D_CLIENT_MODE, *PRT_802_11_D_CLIENT_MODE; 957} RT_802_11_D_CLIENT_MODE, *PRT_802_11_D_CLIENT_MODE;
976#endif // CONFIG_STA_SUPPORT //
977 958
978typedef struct _RT_CHANNEL_LIST_INFO 959typedef struct _RT_CHANNEL_LIST_INFO
979{ 960{
diff --git a/drivers/staging/rt3070/rt_config.h b/drivers/staging/rt3070/rt_config.h
index 480e22fb2e1..afc492198b6 100644
--- a/drivers/staging/rt3070/rt_config.h
+++ b/drivers/staging/rt3070/rt_config.h
@@ -62,23 +62,16 @@
62#include "chlist.h" 62#include "chlist.h"
63#include "spectrum.h" 63#include "spectrum.h"
64 64
65#ifdef CONFIG_STA_SUPPORT
66#endif // CONFIG_STA_SUPPORT //
67
68#ifdef IGMP_SNOOP_SUPPORT 65#ifdef IGMP_SNOOP_SUPPORT
69#include "igmp_snoop.h" 66#include "igmp_snoop.h"
70#endif // IGMP_SNOOP_SUPPORT // 67#endif // IGMP_SNOOP_SUPPORT //
71 68
72#ifdef CONFIG_STA_SUPPORT
73#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT 69#ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
74#ifndef WPA_SUPPLICANT_SUPPORT 70#ifndef WPA_SUPPLICANT_SUPPORT
75#error "Build for being controlled by NetworkManager or wext, please set HAS_WPA_SUPPLICANT=y and HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y" 71#error "Build for being controlled by NetworkManager or wext, please set HAS_WPA_SUPPLICANT=y and HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y"
76#endif // WPA_SUPPLICANT_SUPPORT // 72#endif // WPA_SUPPLICANT_SUPPORT //
77#endif // NATIVE_WPA_SUPPLICANT_SUPPORT // 73#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
78 74
79#endif // CONFIG_STA_SUPPORT //
80
81
82#ifdef IKANOS_VX_1X0 75#ifdef IKANOS_VX_1X0
83#include "vr_ikans.h" 76#include "vr_ikans.h"
84#endif // IKANOS_VX_1X0 // 77#endif // IKANOS_VX_1X0 //
diff --git a/drivers/staging/rt3070/rt_linux.c b/drivers/staging/rt3070/rt_linux.c
index 555d8648de1..d475487c635 100644
--- a/drivers/staging/rt3070/rt_linux.c
+++ b/drivers/staging/rt3070/rt_linux.c
@@ -38,8 +38,6 @@ BUILD_TIMER_FUNCTION(AsicRfTuningExec);
38BUILD_TIMER_FUNCTION(BeaconUpdateExec); 38BUILD_TIMER_FUNCTION(BeaconUpdateExec);
39#endif // RT2870 // 39#endif // RT2870 //
40 40
41
42#ifdef CONFIG_STA_SUPPORT
43BUILD_TIMER_FUNCTION(BeaconTimeout); 41BUILD_TIMER_FUNCTION(BeaconTimeout);
44BUILD_TIMER_FUNCTION(ScanTimeout); 42BUILD_TIMER_FUNCTION(ScanTimeout);
45BUILD_TIMER_FUNCTION(AuthTimeout); 43BUILD_TIMER_FUNCTION(AuthTimeout);
@@ -49,7 +47,6 @@ BUILD_TIMER_FUNCTION(DisassocTimeout);
49BUILD_TIMER_FUNCTION(LinkDownExec); 47BUILD_TIMER_FUNCTION(LinkDownExec);
50BUILD_TIMER_FUNCTION(StaQuickResponeForRateUpExec); 48BUILD_TIMER_FUNCTION(StaQuickResponeForRateUpExec);
51BUILD_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc); 49BUILD_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc);
52#endif // CONFIG_STA_SUPPORT //
53 50
54 51
55 52
@@ -495,13 +492,10 @@ PNET_DEV get_netdev_from_bssid(
495{ 492{
496 PNET_DEV dev_p = NULL; 493 PNET_DEV dev_p = NULL;
497 494
498
499#ifdef CONFIG_STA_SUPPORT
500 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 495 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
501 { 496 {
502 dev_p = pAd->net_dev; 497 dev_p = pAd->net_dev;
503 } 498 }
504#endif // CONFIG_STA_SUPPORT //
505 499
506 ASSERT(dev_p); 500 ASSERT(dev_p);
507 return dev_p; /* return one of MBSS */ 501 return dev_p; /* return one of MBSS */
@@ -657,10 +651,8 @@ void wlan_802_11_to_802_3_packet(
657 // 651 //
658 // 652 //
659 653
660#ifdef CONFIG_STA_SUPPORT
661 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 654 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
662 NdisMoveMemory(skb_push(pOSPkt, LENGTH_802_3), pHeader802_3, LENGTH_802_3); 655 NdisMoveMemory(skb_push(pOSPkt, LENGTH_802_3), pHeader802_3, LENGTH_802_3);
663#endif // CONFIG_STA_SUPPORT //
664 } 656 }
665 657
666 658
@@ -676,9 +668,6 @@ void announce_802_3_packet(
676 668
677 pRxPkt = RTPKT_TO_OSPKT(pPacket); 669 pRxPkt = RTPKT_TO_OSPKT(pPacket);
678 670
679#ifdef CONFIG_STA_SUPPORT
680#endif // CONFIG_STA_SUPPORT //
681
682 /* Push up the protocol stack */ 671 /* Push up the protocol stack */
683#ifdef IKANOS_VX_1X0 672#ifdef IKANOS_VX_1X0
684 IKANOS_DataFrameRx(pAd, pRxPkt->dev, pRxPkt, pRxPkt->len); 673 IKANOS_DataFrameRx(pAd, pRxPkt->dev, pRxPkt, pRxPkt->len);
@@ -831,8 +820,6 @@ VOID RTMPSendWirelessEvent(
831#endif /* WIRELESS_EXT >= 15 */ 820#endif /* WIRELESS_EXT >= 15 */
832} 821}
833 822
834
835#ifdef CONFIG_STA_SUPPORT
836void send_monitor_packets( 823void send_monitor_packets(
837 IN PRTMP_ADAPTER pAd, 824 IN PRTMP_ADAPTER pAd,
838 IN RX_BLK *pRxBlk) 825 IN RX_BLK *pRxBlk)
@@ -1003,8 +990,6 @@ err_free_sk_buff:
1003 return; 990 return;
1004 991
1005} 992}
1006#endif // CONFIG_STA_SUPPORT //
1007
1008 993
1009void rtmp_os_thread_init(PUCHAR pThreadName, PVOID pNotify) 994void rtmp_os_thread_init(PUCHAR pThreadName, PVOID pNotify)
1010{ 995{
diff --git a/drivers/staging/rt3070/rt_linux.h b/drivers/staging/rt3070/rt_linux.h
index 6c34b0b5537..d2a1b9728a9 100644
--- a/drivers/staging/rt3070/rt_linux.h
+++ b/drivers/staging/rt3070/rt_linux.h
@@ -88,8 +88,6 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
88 88
89// add by kathy 89// add by kathy
90 90
91#ifdef CONFIG_STA_SUPPORT
92
93#ifdef RT2870 91#ifdef RT2870
94#define STA_PROFILE_PATH "/etc/Wireless/RT2870STA/RT2870STA.dat" 92#define STA_PROFILE_PATH "/etc/Wireless/RT2870STA/RT2870STA.dat"
95#define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin" 93#define STA_RT2870_IMAGE_FILE_NAME "/etc/Wireless/RT2870STA/rt2870.bin"
@@ -97,9 +95,6 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
97#define STA_DRIVER_VERSION "2.0.1.0" 95#define STA_DRIVER_VERSION "2.0.1.0"
98#endif // RT2870 // 96#endif // RT2870 //
99 97
100#endif // CONFIG_STA_SUPPORT //
101
102
103#define RTMP_TIME_AFTER(a,b) \ 98#define RTMP_TIME_AFTER(a,b) \
104 (typecheck(unsigned long, (unsigned long)a) && \ 99 (typecheck(unsigned long, (unsigned long)a) && \
105 typecheck(unsigned long, (unsigned long)b) && \ 100 typecheck(unsigned long, (unsigned long)b) && \
@@ -138,17 +133,12 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
138#define MIN_NET_DEVICE_FOR_WDS 0x10 //0x40,0x50,0x60,0x70 133#define MIN_NET_DEVICE_FOR_WDS 0x10 //0x40,0x50,0x60,0x70
139#define MIN_NET_DEVICE_FOR_APCLI 0x20 134#define MIN_NET_DEVICE_FOR_APCLI 0x20
140#define MIN_NET_DEVICE_FOR_MESH 0x30 135#define MIN_NET_DEVICE_FOR_MESH 0x30
141#ifdef CONFIG_STA_SUPPORT
142#define MIN_NET_DEVICE_FOR_DLS 0x40 136#define MIN_NET_DEVICE_FOR_DLS 0x40
143#endif // CONFIG_STA_SUPPORT //
144 137
145
146#ifdef CONFIG_STA_SUPPORT
147#define NDIS_PACKET_TYPE_DIRECTED 0 138#define NDIS_PACKET_TYPE_DIRECTED 0
148#define NDIS_PACKET_TYPE_MULTICAST 1 139#define NDIS_PACKET_TYPE_MULTICAST 1
149#define NDIS_PACKET_TYPE_BROADCAST 2 140#define NDIS_PACKET_TYPE_BROADCAST 2
150#define NDIS_PACKET_TYPE_ALL_MULTICAST 3 141#define NDIS_PACKET_TYPE_ALL_MULTICAST 3
151#endif // CONFIG_STA_SUPPORT //
152 142
153struct os_lock { 143struct os_lock {
154 spinlock_t lock; 144 spinlock_t lock;
@@ -513,8 +503,6 @@ DECLARE_TIMER_FUNCTION(AsicRfTuningExec);
513DECLARE_TIMER_FUNCTION(BeaconUpdateExec); 503DECLARE_TIMER_FUNCTION(BeaconUpdateExec);
514#endif // RT2870 // 504#endif // RT2870 //
515 505
516
517#ifdef CONFIG_STA_SUPPORT
518DECLARE_TIMER_FUNCTION(BeaconTimeout); 506DECLARE_TIMER_FUNCTION(BeaconTimeout);
519DECLARE_TIMER_FUNCTION(ScanTimeout); 507DECLARE_TIMER_FUNCTION(ScanTimeout);
520DECLARE_TIMER_FUNCTION(AuthTimeout); 508DECLARE_TIMER_FUNCTION(AuthTimeout);
@@ -526,7 +514,6 @@ DECLARE_TIMER_FUNCTION(StaQuickResponeForRateUpExec);
526DECLARE_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc); 514DECLARE_TIMER_FUNCTION(WpaDisassocApAndBlockAssoc);
527DECLARE_TIMER_FUNCTION(PsPollWakeExec); 515DECLARE_TIMER_FUNCTION(PsPollWakeExec);
528DECLARE_TIMER_FUNCTION(RadioOnExec); 516DECLARE_TIMER_FUNCTION(RadioOnExec);
529#endif // CONFIG_STA_SUPPORT //
530 517
531void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time); 518void RTMP_GetCurrentSystemTime(LARGE_INTEGER *time);
532 519
diff --git a/drivers/staging/rt3070/rt_main_dev.c b/drivers/staging/rt3070/rt_main_dev.c
index b85d584a8ef..103ed70d604 100644
--- a/drivers/staging/rt3070/rt_main_dev.c
+++ b/drivers/staging/rt3070/rt_main_dev.c
@@ -72,9 +72,7 @@ INT rt28xx_send_packets(IN struct sk_buff *skb_p, IN struct net_device *net_dev)
72static void CfgInitHook(PRTMP_ADAPTER pAd); 72static void CfgInitHook(PRTMP_ADAPTER pAd);
73//static BOOLEAN RT28XXAvailRANameAssign(IN CHAR *name_p); 73//static BOOLEAN RT28XXAvailRANameAssign(IN CHAR *name_p);
74 74
75#ifdef CONFIG_STA_SUPPORT
76extern const struct iw_handler_def rt28xx_iw_handler_def; 75extern const struct iw_handler_def rt28xx_iw_handler_def;
77#endif // CONFIG_STA_SUPPORT //
78 76
79#if WIRELESS_EXT >= 12 77#if WIRELESS_EXT >= 12
80// This function will be called when query /proc 78// This function will be called when query /proc
@@ -206,7 +204,6 @@ int rt28xx_close(IN PNET_DEV dev)
206 if (pAd == NULL) 204 if (pAd == NULL)
207 return 0; // close ok 205 return 0; // close ok
208 206
209#ifdef CONFIG_STA_SUPPORT
210 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 207 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
211 { 208 {
212 209
@@ -267,7 +264,6 @@ int rt28xx_close(IN PNET_DEV dev)
267 264
268 MlmeRadioOff(pAd); 265 MlmeRadioOff(pAd);
269 } 266 }
270#endif // CONFIG_STA_SUPPORT //
271 267
272 RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS); 268 RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS);
273 269
@@ -323,13 +319,10 @@ int rt28xx_close(IN PNET_DEV dev)
323 // Close kernel threads or tasklets 319 // Close kernel threads or tasklets
324 kill_thread_task(pAd); 320 kill_thread_task(pAd);
325 321
326
327#ifdef CONFIG_STA_SUPPORT
328 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 322 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
329 { 323 {
330 MacTableReset(pAd); 324 MacTableReset(pAd);
331 } 325 }
332#endif // CONFIG_STA_SUPPORT //
333 326
334 327
335 MeasureReqTabExit(pAd); 328 MeasureReqTabExit(pAd);
@@ -439,10 +432,8 @@ static int rt28xx_init(IN struct net_device *net_dev)
439 432
440 CfgInitHook(pAd); 433 CfgInitHook(pAd);
441 434
442#ifdef CONFIG_STA_SUPPORT
443 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 435 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
444 NdisAllocateSpinLock(&pAd->MacTabLock); 436 NdisAllocateSpinLock(&pAd->MacTabLock);
445#endif // CONFIG_STA_SUPPORT //
446 437
447 MeasureReqTabInit(pAd); 438 MeasureReqTabInit(pAd);
448 TpcReqTabInit(pAd); 439 TpcReqTabInit(pAd);
@@ -502,8 +493,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
502 493
503 // We should read EEPROM for all cases. rt2860b 494 // We should read EEPROM for all cases. rt2860b
504 NICReadEEPROMParameters(pAd, mac); 495 NICReadEEPROMParameters(pAd, mac);
505#ifdef CONFIG_STA_SUPPORT
506#endif // CONFIG_STA_SUPPORT //
507 496
508 printk("3. Phy Mode = %d\n", pAd->CommonCfg.PhyMode); 497 printk("3. Phy Mode = %d\n", pAd->CommonCfg.PhyMode);
509 498
@@ -643,9 +632,6 @@ int rt28xx_open(IN PNET_DEV dev)
643 return -1; 632 return -1;
644 } 633 }
645 634
646#ifdef CONFIG_STA_SUPPORT
647#endif // CONFIG_STA_SUPPORT //
648
649 // Init 635 // Init
650 pObj = (POS_COOKIE)pAd->OS_Cookie; 636 pObj = (POS_COOKIE)pAd->OS_Cookie;
651 637
@@ -664,13 +650,11 @@ int rt28xx_open(IN PNET_DEV dev)
664 if (rt28xx_init(net_dev) == FALSE) 650 if (rt28xx_init(net_dev) == FALSE)
665 goto err; 651 goto err;
666 652
667#ifdef CONFIG_STA_SUPPORT
668 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 653 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
669 { 654 {
670 NdisZeroMemory(pAd->StaCfg.dev_name, 16); 655 NdisZeroMemory(pAd->StaCfg.dev_name, 16);
671 NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name, strlen(net_dev->name)); 656 NdisMoveMemory(pAd->StaCfg.dev_name, net_dev->name, strlen(net_dev->name));
672 } 657 }
673#endif // CONFIG_STA_SUPPORT //
674 658
675 // Set up the Mac address 659 // Set up the Mac address
676 NdisMoveMemory(net_dev->dev_addr, (void *) pAd->CurrentAddress, 6); 660 NdisMoveMemory(net_dev->dev_addr, (void *) pAd->CurrentAddress, 6);
@@ -682,7 +666,6 @@ int rt28xx_open(IN PNET_DEV dev)
682 666
683 667
684 668
685#ifdef CONFIG_STA_SUPPORT
686 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 669 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
687 { 670 {
688#ifdef WPA_SUPPLICANT_SUPPORT 671#ifdef WPA_SUPPLICANT_SUPPORT
@@ -698,7 +681,6 @@ int rt28xx_open(IN PNET_DEV dev)
698#endif // WPA_SUPPLICANT_SUPPORT // 681#endif // WPA_SUPPLICANT_SUPPORT //
699 682
700 } 683 }
701#endif // CONFIG_STA_SUPPORT //
702 684
703 // Enable Interrupt 685 // Enable Interrupt
704 RT28XX_IRQ_ENABLE(pAd); 686 RT28XX_IRQ_ENABLE(pAd);
@@ -726,9 +708,6 @@ int rt28xx_open(IN PNET_DEV dev)
726 708
727 } 709 }
728 710
729#ifdef CONFIG_STA_SUPPORT
730#endif // CONFIG_STA_SUPPORT //
731
732 return (retval); 711 return (retval);
733 712
734err: 713err:
@@ -762,14 +741,12 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p
762 //ether_setup(dev); 741 //ether_setup(dev);
763// dev->set_multicast_list = ieee80211_set_multicast_list; 742// dev->set_multicast_list = ieee80211_set_multicast_list;
764// dev->change_mtu = ieee80211_change_mtu; 743// dev->change_mtu = ieee80211_change_mtu;
765#ifdef CONFIG_STA_SUPPORT
766#if WIRELESS_EXT >= 12 744#if WIRELESS_EXT >= 12
767 if (pAd->OpMode == OPMODE_STA) 745 if (pAd->OpMode == OPMODE_STA)
768 { 746 {
769 dev->wireless_handlers = &rt28xx_iw_handler_def; 747 dev->wireless_handlers = &rt28xx_iw_handler_def;
770 } 748 }
771#endif //WIRELESS_EXT >= 12 749#endif //WIRELESS_EXT >= 12
772#endif // CONFIG_STA_SUPPORT //
773 750
774#if WIRELESS_EXT < 21 751#if WIRELESS_EXT < 21
775 dev->get_wireless_stats = rt28xx_get_wireless_stats; 752 dev->get_wireless_stats = rt28xx_get_wireless_stats;
@@ -840,9 +817,7 @@ INT __devinit rt28xx_probe(
840#endif // RT2870 // 817#endif // RT2870 //
841 818
842 819
843#ifdef CONFIG_STA_SUPPORT
844 DBGPRINT(RT_DEBUG_TRACE, ("STA Driver version-%s\n", STA_DRIVER_VERSION)); 820 DBGPRINT(RT_DEBUG_TRACE, ("STA Driver version-%s\n", STA_DRIVER_VERSION));
845#endif // CONFIG_STA_SUPPORT //
846 821
847 // Check chipset vendor/product ID 822 // Check chipset vendor/product ID
848// if (RT28XXChipsetCheck(_dev_p) == FALSE) 823// if (RT28XXChipsetCheck(_dev_p) == FALSE)
@@ -882,9 +857,7 @@ INT __devinit rt28xx_probe(
882 857
883 RT28XXNetDevInit(_dev_p, net_dev, pAd); 858 RT28XXNetDevInit(_dev_p, net_dev, pAd);
884 859
885#ifdef CONFIG_STA_SUPPORT
886 pAd->StaCfg.OriDevType = net_dev->type; 860 pAd->StaCfg.OriDevType = net_dev->type;
887#endif // CONFIG_STA_SUPPORT //
888 861
889 // Find and assign a free interface name, raxx 862 // Find and assign a free interface name, raxx
890// RT28XXAvailRANameAssign(net_dev->name); 863// RT28XXAvailRANameAssign(net_dev->name);
@@ -893,9 +866,7 @@ INT __devinit rt28xx_probe(
893 if (RT28XXProbePostConfig(_dev_p, pAd, 0) == FALSE) 866 if (RT28XXProbePostConfig(_dev_p, pAd, 0) == FALSE)
894 goto err_out_unmap; 867 goto err_out_unmap;
895 868
896#ifdef CONFIG_STA_SUPPORT
897 pAd->OpMode = OPMODE_STA; 869 pAd->OpMode = OPMODE_STA;
898#endif // CONFIG_STA_SUPPORT //
899 870
900 // sample move 871 // sample move
901 if (rt_ieee80211_if_setup(net_dev, pAd) != NDIS_STATUS_SUCCESS) 872 if (rt_ieee80211_if_setup(net_dev, pAd) != NDIS_STATUS_SUCCESS)
@@ -954,7 +925,6 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
954 int status = 0; 925 int status = 0;
955 PNDIS_PACKET pPacket = (PNDIS_PACKET) skb; 926 PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;
956 927
957#ifdef CONFIG_STA_SUPPORT
958 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 928 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
959 { 929 {
960 // Drop send request since we are in monitor mode 930 // Drop send request since we are in monitor mode
@@ -964,7 +934,6 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
964 goto done; 934 goto done;
965 } 935 }
966 } 936 }
967#endif // CONFIG_STA_SUPPORT //
968 937
969 // EapolStart size is 18 938 // EapolStart size is 18
970 if (skb->len < 14) 939 if (skb->len < 14)
@@ -983,17 +952,12 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
983 } 952 }
984#endif 953#endif
985 954
986
987
988#ifdef CONFIG_STA_SUPPORT
989 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 955 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
990 { 956 {
991 957
992 STASendPackets((NDIS_HANDLE)pAd, (PPNDIS_PACKET) &pPacket, 1); 958 STASendPackets((NDIS_HANDLE)pAd, (PPNDIS_PACKET) &pPacket, 1);
993 } 959 }
994 960
995#endif // CONFIG_STA_SUPPORT //
996
997 status = 0; 961 status = 0;
998done: 962done:
999 963
@@ -1061,10 +1025,8 @@ struct iw_statistics *rt28xx_get_wireless_stats(
1061 if(pAd->iw_stats.qual.qual > 100) 1025 if(pAd->iw_stats.qual.qual > 100)
1062 pAd->iw_stats.qual.qual = 100; 1026 pAd->iw_stats.qual.qual = 100;
1063 1027
1064#ifdef CONFIG_STA_SUPPORT
1065 if (pAd->OpMode == OPMODE_STA) 1028 if (pAd->OpMode == OPMODE_STA)
1066 pAd->iw_stats.qual.level = RTMPMaxRssi(pAd, pAd->StaCfg.RssiSample.LastRssi0, pAd->StaCfg.RssiSample.LastRssi1, pAd->StaCfg.RssiSample.LastRssi2); 1029 pAd->iw_stats.qual.level = RTMPMaxRssi(pAd, pAd->StaCfg.RssiSample.LastRssi0, pAd->StaCfg.RssiSample.LastRssi1, pAd->StaCfg.RssiSample.LastRssi2);
1067#endif // CONFIG_STA_SUPPORT //
1068 1030
1069 pAd->iw_stats.qual.noise = pAd->BbpWriteLatch[66]; // noise level (dBm) 1031 pAd->iw_stats.qual.noise = pAd->BbpWriteLatch[66]; // noise level (dBm)
1070 1032
@@ -1116,13 +1078,10 @@ INT rt28xx_ioctl(
1116 return -ENETDOWN; 1078 return -ENETDOWN;
1117 } 1079 }
1118 1080
1119
1120#ifdef CONFIG_STA_SUPPORT
1121 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1081 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1122 { 1082 {
1123 ret = rt28xx_sta_ioctl(net_dev, rq, cmd); 1083 ret = rt28xx_sta_ioctl(net_dev, rq, cmd);
1124 } 1084 }
1125#endif // CONFIG_STA_SUPPORT //
1126 1085
1127 return ret; 1086 return ret;
1128} 1087}
diff --git a/drivers/staging/rt3070/rt_profile.c b/drivers/staging/rt3070/rt_profile.c
index 4bcd9414a7a..f12e307d6fc 100644
--- a/drivers/staging/rt3070/rt_profile.c
+++ b/drivers/staging/rt3070/rt_profile.c
@@ -756,8 +756,6 @@ static void rtmp_read_key_parms_from_file(IN PRTMP_ADAPTER pAd, char *tmpbuf, c
756 //DefaultKeyID 756 //DefaultKeyID
757 if(RTMPGetKeyParameter("DefaultKeyID", tmpbuf, 25, buffer)) 757 if(RTMPGetKeyParameter("DefaultKeyID", tmpbuf, 25, buffer))
758 { 758 {
759
760#ifdef CONFIG_STA_SUPPORT
761 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 759 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
762 { 760 {
763 KeyIdx = simple_strtol(tmpbuf, 0, 10); 761 KeyIdx = simple_strtol(tmpbuf, 0, 10);
@@ -768,7 +766,6 @@ static void rtmp_read_key_parms_from_file(IN PRTMP_ADAPTER pAd, char *tmpbuf, c
768 766
769 DBGPRINT(RT_DEBUG_TRACE, ("DefaultKeyID(0~3)=%d\n", pAd->StaCfg.DefaultKeyId)); 767 DBGPRINT(RT_DEBUG_TRACE, ("DefaultKeyID(0~3)=%d\n", pAd->StaCfg.DefaultKeyId));
770 } 768 }
771#endif // CONFIG_STA_SUPPORT //
772 } 769 }
773 770
774 771
@@ -783,7 +780,6 @@ static void rtmp_read_key_parms_from_file(IN PRTMP_ADAPTER pAd, char *tmpbuf, c
783 KeyType[i] = simple_strtol(macptr, 0, 10); 780 KeyType[i] = simple_strtol(macptr, 0, 10);
784 } 781 }
785 782
786#ifdef CONFIG_STA_SUPPORT
787 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 783 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
788 { 784 {
789 sprintf(tok_str, "Key%dStr", idx + 1); 785 sprintf(tok_str, "Key%dStr", idx + 1);
@@ -792,13 +788,10 @@ static void rtmp_read_key_parms_from_file(IN PRTMP_ADAPTER pAd, char *tmpbuf, c
792 rtmp_parse_key_buffer_from_file(pAd, tmpbuf, KeyType[BSS0], BSS0, idx); 788 rtmp_parse_key_buffer_from_file(pAd, tmpbuf, KeyType[BSS0], BSS0, idx);
793 } 789 }
794 } 790 }
795#endif // CONFIG_STA_SUPPORT //
796 } 791 }
797 } 792 }
798} 793}
799 794
800
801#ifdef CONFIG_STA_SUPPORT
802static void rtmp_read_sta_wmm_parms_from_file(IN PRTMP_ADAPTER pAd, char *tmpbuf, char *buffer) 795static void rtmp_read_sta_wmm_parms_from_file(IN PRTMP_ADAPTER pAd, char *tmpbuf, char *buffer)
803{ 796{
804 PUCHAR macptr; 797 PUCHAR macptr;
@@ -865,8 +858,6 @@ static void rtmp_read_sta_wmm_parms_from_file(IN PRTMP_ADAPTER pAd, char *tmpbu
865 } 858 }
866 859
867} 860}
868#endif // CONFIG_STA_SUPPORT //
869
870 861
871NDIS_STATUS RTMPReadParametersHook( 862NDIS_STATUS RTMPReadParametersHook(
872 IN PRTMP_ADAPTER pAd) 863 IN PRTMP_ADAPTER pAd)
@@ -879,10 +870,7 @@ NDIS_STATUS RTMPReadParametersHook(
879 CHAR *tmpbuf; 870 CHAR *tmpbuf;
880 ULONG RtsThresh; 871 ULONG RtsThresh;
881 ULONG FragThresh; 872 ULONG FragThresh;
882#ifdef CONFIG_STA_SUPPORT
883 UCHAR keyMaterial[40]; 873 UCHAR keyMaterial[40];
884#endif // CONFIG_STA_SUPPORT //
885
886 874
887 PUCHAR macptr; 875 PUCHAR macptr;
888 INT i = 0; 876 INT i = 0;
@@ -898,10 +886,8 @@ NDIS_STATUS RTMPReadParametersHook(
898 return NDIS_STATUS_FAILURE; 886 return NDIS_STATUS_FAILURE;
899 } 887 }
900 888
901#ifdef CONFIG_STA_SUPPORT
902 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 889 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
903 src = STA_PROFILE_PATH; 890 src = STA_PROFILE_PATH;
904#endif // CONFIG_STA_SUPPORT //
905 891
906 // Save uid and gid used for filesystem access. 892 // Save uid and gid used for filesystem access.
907 // Set user and group to 0 (root) 893 // Set user and group to 0 (root)
@@ -975,8 +961,6 @@ NDIS_STATUS RTMPReadParametersHook(
975 pAd->CommonCfg.CountryCode[2] = ' '; 961 pAd->CommonCfg.CountryCode[2] = ' ';
976 } 962 }
977 963
978
979#ifdef CONFIG_STA_SUPPORT
980 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 964 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
981 { 965 {
982 //SSID 966 //SSID
@@ -997,9 +981,7 @@ NDIS_STATUS RTMPReadParametersHook(
997 } 981 }
998 } 982 }
999 } 983 }
1000#endif // CONFIG_STA_SUPPORT //
1001 984
1002#ifdef CONFIG_STA_SUPPORT
1003 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 985 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1004 { 986 {
1005 //NetworkType 987 //NetworkType
@@ -1015,7 +997,7 @@ NDIS_STATUS RTMPReadParametersHook(
1015 DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __func__, pAd->StaCfg.BssType)); 997 DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __func__, pAd->StaCfg.BssType));
1016 } 998 }
1017 } 999 }
1018#endif // CONFIG_STA_SUPPORT // 1000
1019 //Channel 1001 //Channel
1020 if(RTMPGetKeyParameter("Channel", tmpbuf, 10, buffer)) 1002 if(RTMPGetKeyParameter("Channel", tmpbuf, 10, buffer))
1021 { 1003 {
@@ -1055,10 +1037,10 @@ NDIS_STATUS RTMPReadParametersHook(
1055 if(RTMPGetKeyParameter("TxPower", tmpbuf, 10, buffer)) 1037 if(RTMPGetKeyParameter("TxPower", tmpbuf, 10, buffer))
1056 { 1038 {
1057 pAd->CommonCfg.TxPowerPercentage = (ULONG) simple_strtol(tmpbuf, 0, 10); 1039 pAd->CommonCfg.TxPowerPercentage = (ULONG) simple_strtol(tmpbuf, 0, 10);
1058#ifdef CONFIG_STA_SUPPORT 1040
1059 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1041 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1060 pAd->CommonCfg.TxPowerDefault = pAd->CommonCfg.TxPowerPercentage; 1042 pAd->CommonCfg.TxPowerDefault = pAd->CommonCfg.TxPowerPercentage;
1061#endif // CONFIG_STA_SUPPORT // 1043
1062 DBGPRINT(RT_DEBUG_TRACE, ("TxPower=%ld\n", pAd->CommonCfg.TxPowerPercentage)); 1044 DBGPRINT(RT_DEBUG_TRACE, ("TxPower=%ld\n", pAd->CommonCfg.TxPowerPercentage));
1063 } 1045 }
1064 //BGProtection 1046 //BGProtection
@@ -1179,11 +1161,8 @@ NDIS_STATUS RTMPReadParametersHook(
1179#endif // AGGREGATION_SUPPORT // 1161#endif // AGGREGATION_SUPPORT //
1180 1162
1181 // WmmCapable 1163 // WmmCapable
1182
1183#ifdef CONFIG_STA_SUPPORT
1184 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1164 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1185 rtmp_read_sta_wmm_parms_from_file(pAd, tmpbuf, buffer); 1165 rtmp_read_sta_wmm_parms_from_file(pAd, tmpbuf, buffer);
1186#endif // CONFIG_STA_SUPPORT //
1187 1166
1188 //ShortSlot 1167 //ShortSlot
1189 if(RTMPGetKeyParameter("ShortSlot", tmpbuf, 10, buffer)) 1168 if(RTMPGetKeyParameter("ShortSlot", tmpbuf, 10, buffer))
@@ -1286,7 +1265,6 @@ NDIS_STATUS RTMPReadParametersHook(
1286 //AuthMode 1265 //AuthMode
1287 if(RTMPGetKeyParameter("AuthMode", tmpbuf, 128, buffer)) 1266 if(RTMPGetKeyParameter("AuthMode", tmpbuf, 128, buffer))
1288 { 1267 {
1289#ifdef CONFIG_STA_SUPPORT
1290 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1268 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1291 { 1269 {
1292 if ((strcmp(tmpbuf, "WEPAUTO") == 0) || (strcmp(tmpbuf, "wepauto") == 0)) 1270 if ((strcmp(tmpbuf, "WEPAUTO") == 0) || (strcmp(tmpbuf, "wepauto") == 0))
@@ -1312,13 +1290,10 @@ NDIS_STATUS RTMPReadParametersHook(
1312 1290
1313 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus)); 1291 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
1314 } 1292 }
1315#endif // CONFIG_STA_SUPPORT //
1316 } 1293 }
1317 //EncrypType 1294 //EncrypType
1318 if(RTMPGetKeyParameter("EncrypType", tmpbuf, 128, buffer)) 1295 if(RTMPGetKeyParameter("EncrypType", tmpbuf, 128, buffer))
1319 { 1296 {
1320
1321#ifdef CONFIG_STA_SUPPORT
1322 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1297 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1323 { 1298 {
1324 if ((strcmp(tmpbuf, "WEP") == 0) || (strcmp(tmpbuf, "wep") == 0)) 1299 if ((strcmp(tmpbuf, "WEP") == 0) || (strcmp(tmpbuf, "wep") == 0))
@@ -1339,12 +1314,8 @@ NDIS_STATUS RTMPReadParametersHook(
1339 //RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0); 1314 //RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0);
1340 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus)); 1315 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
1341 } 1316 }
1342#endif // CONFIG_STA_SUPPORT //
1343 } 1317 }
1344 1318
1345
1346
1347#ifdef CONFIG_STA_SUPPORT
1348 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1319 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1349 { 1320 {
1350 if(RTMPGetCriticalParameter("WPAPSK", tmpbuf, 512, buffer)) 1321 if(RTMPGetCriticalParameter("WPAPSK", tmpbuf, 512, buffer))
@@ -1409,7 +1380,6 @@ NDIS_STATUS RTMPReadParametersHook(
1409 } 1380 }
1410 } 1381 }
1411 } 1382 }
1412#endif // CONFIG_STA_SUPPORT //
1413 1383
1414 //DefaultKeyID, KeyType, KeyStr 1384 //DefaultKeyID, KeyType, KeyStr
1415 rtmp_read_key_parms_from_file(pAd, tmpbuf, buffer); 1385 rtmp_read_key_parms_from_file(pAd, tmpbuf, buffer);
@@ -1435,7 +1405,6 @@ NDIS_STATUS RTMPReadParametersHook(
1435 HTParametersHook(pAd, tmpbuf, buffer); 1405 HTParametersHook(pAd, tmpbuf, buffer);
1436#endif // DOT11_N_SUPPORT // 1406#endif // DOT11_N_SUPPORT //
1437 1407
1438#ifdef CONFIG_STA_SUPPORT
1439 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1408 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1440 { 1409 {
1441 //PSMode 1410 //PSMode
@@ -1522,11 +1491,8 @@ NDIS_STATUS RTMPReadParametersHook(
1522 DBGPRINT(RT_DEBUG_TRACE, ("TGnWifiTest=%d\n", pAd->StaCfg.bTGnWifiTest)); 1491 DBGPRINT(RT_DEBUG_TRACE, ("TGnWifiTest=%d\n", pAd->StaCfg.bTGnWifiTest));
1523 } 1492 }
1524 } 1493 }
1525#endif // CONFIG_STA_SUPPORT //
1526
1527 1494
1528#ifdef RT30xx 1495#ifdef RT30xx
1529#ifdef CONFIG_STA_SUPPORT
1530 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1496 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1531 { 1497 {
1532 if(RTMPGetKeyParameter("AntDiversity", tmpbuf, 10, buffer)) 1498 if(RTMPGetKeyParameter("AntDiversity", tmpbuf, 10, buffer))
@@ -1542,7 +1508,6 @@ NDIS_STATUS RTMPReadParametersHook(
1542 } 1508 }
1543 } 1509 }
1544 } 1510 }
1545#endif // CONFIG_STA_SUPPORT //
1546#endif // RT30xx // 1511#endif // RT30xx //
1547 } 1512 }
1548 } 1513 }
@@ -1814,7 +1779,6 @@ static void HTParametersHook(
1814 { 1779 {
1815 UCHAR fix_tx_mode; 1780 UCHAR fix_tx_mode;
1816 1781
1817#ifdef CONFIG_STA_SUPPORT
1818 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1782 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1819 { 1783 {
1820 fix_tx_mode = FIXED_TXMODE_HT; 1784 fix_tx_mode = FIXED_TXMODE_HT;
@@ -1847,7 +1811,6 @@ static void HTParametersHook(
1847 DBGPRINT(RT_DEBUG_TRACE, ("Fixed Tx Mode = %d\n", fix_tx_mode)); 1811 DBGPRINT(RT_DEBUG_TRACE, ("Fixed Tx Mode = %d\n", fix_tx_mode));
1848 1812
1849 } 1813 }
1850#endif // CONFIG_STA_SUPPORT //
1851 } 1814 }
1852 1815
1853 1816
@@ -1892,8 +1855,6 @@ static void HTParametersHook(
1892 // MSC 1855 // MSC
1893 if (RTMPGetKeyParameter("HT_MCS", pValueStr, 50, pInput)) 1856 if (RTMPGetKeyParameter("HT_MCS", pValueStr, 50, pInput))
1894 { 1857 {
1895
1896#ifdef CONFIG_STA_SUPPORT
1897 IF_DEV_CONFIG_OPMODE_ON_STA(pAd) 1858 IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
1898 { 1859 {
1899 Value = simple_strtol(pValueStr, 0, 10); 1860 Value = simple_strtol(pValueStr, 0, 10);
@@ -1912,7 +1873,6 @@ static void HTParametersHook(
1912 DBGPRINT(RT_DEBUG_TRACE, ("HT: MCS = AUTO\n")); 1873 DBGPRINT(RT_DEBUG_TRACE, ("HT: MCS = AUTO\n"));
1913 } 1874 }
1914 } 1875 }
1915#endif // CONFIG_STA_SUPPORT //
1916 } 1876 }
1917 1877
1918 // STBC 1878 // STBC
diff --git a/drivers/staging/rt3070/rtmp.h b/drivers/staging/rt3070/rtmp.h
index 598f49f7271..9b24780be47 100644
--- a/drivers/staging/rt3070/rtmp.h
+++ b/drivers/staging/rt3070/rtmp.h
@@ -43,15 +43,13 @@
43#include "link_list.h" 43#include "link_list.h"
44#include "spectrum_def.h" 44#include "spectrum_def.h"
45 45
46#ifdef CONFIG_STA_SUPPORT
47#include "aironet.h" 46#include "aironet.h"
48#endif // CONFIG_STA_SUPPORT //
49 47
50//#define DBG 1 48//#define DBG 1
51 49
52//#define DBG_DIAGNOSE 1 50//#define DBG_DIAGNOSE 1
53 51
54#if defined(CONFIG_AP_SUPPORT) && defined(CONFIG_STA_SUPPORT) 52#if defined(CONFIG_AP_SUPPORT)
55#define IF_DEV_CONFIG_OPMODE_ON_AP(_pAd) if(_pAd->OpMode == OPMODE_AP) 53#define IF_DEV_CONFIG_OPMODE_ON_AP(_pAd) if(_pAd->OpMode == OPMODE_AP)
56#define IF_DEV_CONFIG_OPMODE_ON_STA(_pAd) if(_pAd->OpMode == OPMODE_STA) 54#define IF_DEV_CONFIG_OPMODE_ON_STA(_pAd) if(_pAd->OpMode == OPMODE_STA)
57#else 55#else
@@ -275,9 +273,7 @@ extern UCHAR RateSwitchTable11N1S[];
275extern UCHAR RateSwitchTable11N2S[]; 273extern UCHAR RateSwitchTable11N2S[];
276extern UCHAR RateSwitchTable11N2SForABand[]; 274extern UCHAR RateSwitchTable11N2SForABand[];
277 275
278#ifdef CONFIG_STA_SUPPORT
279extern UCHAR PRE_N_HT_OUI[]; 276extern UCHAR PRE_N_HT_OUI[];
280#endif // CONFIG_STA_SUPPORT //
281#endif // DOT11_N_SUPPORT // 277#endif // DOT11_N_SUPPORT //
282 278
283#define MAXSEQ (0xFFF) 279#define MAXSEQ (0xFFF)
@@ -392,14 +388,12 @@ typedef struct _QUEUE_HEADER {
392#define RX_FILTER_CLEAR_FLAG(_pAd, _F) ((_pAd)->CommonCfg.PacketFilter &= ~(_F)) 388#define RX_FILTER_CLEAR_FLAG(_pAd, _F) ((_pAd)->CommonCfg.PacketFilter &= ~(_F))
393#define RX_FILTER_TEST_FLAG(_pAd, _F) (((_pAd)->CommonCfg.PacketFilter & (_F)) != 0) 389#define RX_FILTER_TEST_FLAG(_pAd, _F) (((_pAd)->CommonCfg.PacketFilter & (_F)) != 0)
394 390
395#ifdef CONFIG_STA_SUPPORT
396#define STA_NO_SECURITY_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11EncryptionDisabled) 391#define STA_NO_SECURITY_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11EncryptionDisabled)
397#define STA_WEP_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11Encryption1Enabled) 392#define STA_WEP_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11Encryption1Enabled)
398#define STA_TKIP_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11Encryption2Enabled) 393#define STA_TKIP_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11Encryption2Enabled)
399#define STA_AES_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11Encryption3Enabled) 394#define STA_AES_ON(_p) (_p->StaCfg.WepStatus == Ndis802_11Encryption3Enabled)
400 395
401#define STA_TGN_WIFI_ON(_p) (_p->StaCfg.bTGnWifiTest == TRUE) 396#define STA_TGN_WIFI_ON(_p) (_p->StaCfg.bTGnWifiTest == TRUE)
402#endif // CONFIG_STA_SUPPORT //
403 397
404#define CKIP_KP_ON(_p) ((((_p)->StaCfg.CkipFlag) & 0x10) && ((_p)->StaCfg.bCkipCmicOn == TRUE)) 398#define CKIP_KP_ON(_p) ((((_p)->StaCfg.CkipFlag) & 0x10) && ((_p)->StaCfg.bCkipCmicOn == TRUE))
405#define CKIP_CMIC_ON(_p) ((((_p)->StaCfg.CkipFlag) & 0x08) && ((_p)->StaCfg.bCkipCmicOn == TRUE)) 399#define CKIP_CMIC_ON(_p) ((((_p)->StaCfg.CkipFlag) & 0x08) && ((_p)->StaCfg.bCkipCmicOn == TRUE))
@@ -819,7 +813,6 @@ typedef struct _RTMP_SCATTER_GATHER_LIST {
819// 813//
820#define JapanChannelCheck(channel) ((channel == 52) || (channel == 56) || (channel == 60) || (channel == 64)) 814#define JapanChannelCheck(channel) ((channel == 52) || (channel == 56) || (channel == 60) || (channel == 64))
821 815
822#ifdef CONFIG_STA_SUPPORT
823#define STA_PORT_SECURED(_pAd) \ 816#define STA_PORT_SECURED(_pAd) \
824{ \ 817{ \
825 _pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; \ 818 _pAd->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; \
@@ -827,8 +820,6 @@ typedef struct _RTMP_SCATTER_GATHER_LIST {
827 _pAd->MacTab.Content[BSSID_WCID].PortSecured = _pAd->StaCfg.PortSecured; \ 820 _pAd->MacTab.Content[BSSID_WCID].PortSecured = _pAd->StaCfg.PortSecured; \
828 NdisReleaseSpinLock(&_pAd->MacTabLock); \ 821 NdisReleaseSpinLock(&_pAd->MacTabLock); \
829} 822}
830#endif // CONFIG_STA_SUPPORT //
831
832 823
833// 824//
834// Register set pair for initialzation register set definition 825// Register set pair for initialzation register set definition
@@ -1119,9 +1110,7 @@ typedef struct _CIPHER_KEY {
1119 UCHAR RxTsc[6]; // 48bit TSC value 1110 UCHAR RxTsc[6]; // 48bit TSC value
1120 UCHAR CipherAlg; // 0-none, 1:WEP64, 2:WEP128, 3:TKIP, 4:AES, 5:CKIP64, 6:CKIP128 1111 UCHAR CipherAlg; // 0-none, 1:WEP64, 2:WEP128, 3:TKIP, 4:AES, 5:CKIP64, 6:CKIP128
1121 UCHAR KeyLen; 1112 UCHAR KeyLen;
1122#ifdef CONFIG_STA_SUPPORT
1123 UCHAR BssId[6]; 1113 UCHAR BssId[6];
1124#endif // CONFIG_STA_SUPPORT //
1125 // Key length for each key, 0: entry is invalid 1114 // Key length for each key, 0: entry is invalid
1126 UCHAR Type; // Indicate Pairwise/Group when reporting MIC error 1115 UCHAR Type; // Indicate Pairwise/Group when reporting MIC error
1127} CIPHER_KEY, *PCIPHER_KEY; 1116} CIPHER_KEY, *PCIPHER_KEY;
@@ -1280,7 +1269,6 @@ typedef enum _ABGBAND_STATE_ {
1280} ABGBAND_STATE; 1269} ABGBAND_STATE;
1281 1270
1282typedef struct _MLME_STRUCT { 1271typedef struct _MLME_STRUCT {
1283#ifdef CONFIG_STA_SUPPORT
1284 // STA state machines 1272 // STA state machines
1285 STATE_MACHINE CntlMachine; 1273 STATE_MACHINE CntlMachine;
1286 STATE_MACHINE AssocMachine; 1274 STATE_MACHINE AssocMachine;
@@ -1296,7 +1284,6 @@ typedef struct _MLME_STRUCT {
1296 STATE_MACHINE_FUNC SyncFunc[SYNC_FUNC_SIZE]; 1284 STATE_MACHINE_FUNC SyncFunc[SYNC_FUNC_SIZE];
1297 STATE_MACHINE_FUNC WpaPskFunc[WPA_PSK_FUNC_SIZE]; 1285 STATE_MACHINE_FUNC WpaPskFunc[WPA_PSK_FUNC_SIZE];
1298 STATE_MACHINE_FUNC AironetFunc[AIRONET_FUNC_SIZE]; 1286 STATE_MACHINE_FUNC AironetFunc[AIRONET_FUNC_SIZE];
1299#endif // CONFIG_STA_SUPPORT //
1300 STATE_MACHINE_FUNC ActFunc[ACT_FUNC_SIZE]; 1287 STATE_MACHINE_FUNC ActFunc[ACT_FUNC_SIZE];
1301 // Action 1288 // Action
1302 STATE_MACHINE ActMachine; 1289 STATE_MACHINE ActMachine;
@@ -1468,13 +1455,11 @@ typedef struct _IOT_STRUC {
1468 UCHAR RTSShortProt; 1455 UCHAR RTSShortProt;
1469 UCHAR RTSLongProt; 1456 UCHAR RTSLongProt;
1470 BOOLEAN bRTSLongProtOn; 1457 BOOLEAN bRTSLongProtOn;
1471#ifdef CONFIG_STA_SUPPORT
1472 BOOLEAN bLastAtheros; 1458 BOOLEAN bLastAtheros;
1473 BOOLEAN bCurrentAtheros; 1459 BOOLEAN bCurrentAtheros;
1474 BOOLEAN bNowAtherosBurstOn; 1460 BOOLEAN bNowAtherosBurstOn;
1475 BOOLEAN bNextDisableRxBA; 1461 BOOLEAN bNextDisableRxBA;
1476 BOOLEAN bToggle; 1462 BOOLEAN bToggle;
1477#endif // CONFIG_STA_SUPPORT //
1478} IOT_STRUC, *PIOT_STRUC; 1463} IOT_STRUC, *PIOT_STRUC;
1479 1464
1480// This is the registry setting for 802.11n transmit setting. Used in advanced page. 1465// This is the registry setting for 802.11n transmit setting. Used in advanced page.
@@ -1751,9 +1736,7 @@ typedef struct _COMMON_CONFIG {
1751 EDCA_PARM APEdcaParm; // EDCA parameters of the current associated AP 1736 EDCA_PARM APEdcaParm; // EDCA parameters of the current associated AP
1752 QBSS_LOAD_PARM APQbssLoad; // QBSS load of the current associated AP 1737 QBSS_LOAD_PARM APQbssLoad; // QBSS load of the current associated AP
1753 UCHAR AckPolicy[4]; // ACK policy of the specified AC. see ACK_xxx 1738 UCHAR AckPolicy[4]; // ACK policy of the specified AC. see ACK_xxx
1754#ifdef CONFIG_STA_SUPPORT
1755 BOOLEAN bDLSCapable; // 0:disable DLS, 1:enable DLS 1739 BOOLEAN bDLSCapable; // 0:disable DLS, 1:enable DLS
1756#endif // CONFIG_STA_SUPPORT //
1757 // a bitmap of BOOLEAN flags. each bit represent an operation status of a particular 1740 // a bitmap of BOOLEAN flags. each bit represent an operation status of a particular
1758 // BOOLEAN control, either ON or OFF. These flags should always be accessed via 1741 // BOOLEAN control, either ON or OFF. These flags should always be accessed via
1759 // OPSTATUS_TEST_FLAG(), OPSTATUS_SET_FLAG(), OP_STATUS_CLEAR_FLAG() macros. 1742 // OPSTATUS_TEST_FLAG(), OPSTATUS_SET_FLAG(), OP_STATUS_CLEAR_FLAG() macros.
@@ -1834,8 +1817,6 @@ typedef struct _COMMON_CONFIG {
1834#endif // MCAST_RATE_SPECIFIC // 1817#endif // MCAST_RATE_SPECIFIC //
1835} COMMON_CONFIG, *PCOMMON_CONFIG; 1818} COMMON_CONFIG, *PCOMMON_CONFIG;
1836 1819
1837
1838#ifdef CONFIG_STA_SUPPORT
1839/* Modified by Wu Xi-Kun 4/21/2006 */ 1820/* Modified by Wu Xi-Kun 4/21/2006 */
1840// STA configuration and status 1821// STA configuration and status
1841typedef struct _STA_ADMIN_CONFIG { 1822typedef struct _STA_ADMIN_CONFIG {
@@ -2067,7 +2048,6 @@ typedef struct _STA_ACTIVE_CONFIG {
2067 RT_HT_PHY_INFO SupportedPhyInfo; 2048 RT_HT_PHY_INFO SupportedPhyInfo;
2068 RT_HT_CAPABILITY SupportedHtPhy; 2049 RT_HT_CAPABILITY SupportedHtPhy;
2069} STA_ACTIVE_CONFIG, *PSTA_ACTIVE_CONFIG; 2050} STA_ACTIVE_CONFIG, *PSTA_ACTIVE_CONFIG;
2070#endif // CONFIG_STA_SUPPORT //
2071 2051
2072#ifdef RT2870 2052#ifdef RT2870
2073typedef struct RT_ADD_PAIRWISE_KEY_ENTRY { 2053typedef struct RT_ADD_PAIRWISE_KEY_ENTRY {
@@ -2222,9 +2202,7 @@ typedef struct _MAC_TABLE_ENTRY {
2222 UINT32 TXMCSFailed[16]; 2202 UINT32 TXMCSFailed[16];
2223 UINT32 TXMCSAutoFallBack[16][16]; 2203 UINT32 TXMCSAutoFallBack[16][16];
2224 2204
2225#ifdef CONFIG_STA_SUPPORT
2226 ULONG LastBeaconRxTime; 2205 ULONG LastBeaconRxTime;
2227#endif // CONFIG_STA_SUPPORT //
2228} MAC_TABLE_ENTRY, *PMAC_TABLE_ENTRY; 2206} MAC_TABLE_ENTRY, *PMAC_TABLE_ENTRY;
2229 2207
2230typedef struct _MAC_TABLE { 2208typedef struct _MAC_TABLE {
@@ -2669,7 +2647,6 @@ typedef struct _RTMP_ADAPTER
2669 2647
2670 2648
2671//=======STA=========== 2649//=======STA===========
2672#ifdef CONFIG_STA_SUPPORT
2673/* Modified by Wu Xi-Kun 4/21/2006 */ 2650/* Modified by Wu Xi-Kun 4/21/2006 */
2674 // ----------------------------------------------- 2651 // -----------------------------------------------
2675 // STA specific configuration & operation status 2652 // STA specific configuration & operation status
@@ -2679,7 +2656,6 @@ typedef struct _RTMP_ADAPTER
2679 STA_ACTIVE_CONFIG StaActive; // valid only when ADHOC_ON(pAd) || INFRA_ON(pAd) 2656 STA_ACTIVE_CONFIG StaActive; // valid only when ADHOC_ON(pAd) || INFRA_ON(pAd)
2680 CHAR nickname[IW_ESSID_MAX_SIZE+1]; // nickname, only used in the iwconfig i/f 2657 CHAR nickname[IW_ESSID_MAX_SIZE+1]; // nickname, only used in the iwconfig i/f
2681 NDIS_MEDIA_STATE PreMediaState; 2658 NDIS_MEDIA_STATE PreMediaState;
2682#endif // CONFIG_STA_SUPPORT //
2683 2659
2684//=======Common=========== 2660//=======Common===========
2685 // OP mode: either AP or STA 2661 // OP mode: either AP or STA
@@ -2990,12 +2966,6 @@ typedef struct _TX_BLK_
2990 2966
2991#define fTX_bClearEAPFrame 0x0100 2967#define fTX_bClearEAPFrame 0x0100
2992 2968
2993
2994#ifdef CONFIG_STA_SUPPORT
2995#endif // CONFIG_STA_SUPPORT //
2996
2997
2998
2999#define TX_BLK_ASSIGN_FLAG(_pTxBlk, _flag, value) \ 2969#define TX_BLK_ASSIGN_FLAG(_pTxBlk, _flag, value) \
3000 do { \ 2970 do { \
3001 if (value) \ 2971 if (value) \
@@ -3290,12 +3260,9 @@ VOID PeerPublicAction(
3290 IN PRTMP_ADAPTER pAd, 3260 IN PRTMP_ADAPTER pAd,
3291 IN MLME_QUEUE_ELEM *Elem); 3261 IN MLME_QUEUE_ELEM *Elem);
3292 3262
3293#ifdef CONFIG_STA_SUPPORT
3294VOID StaPublicAction( 3263VOID StaPublicAction(
3295 IN PRTMP_ADAPTER pAd, 3264 IN PRTMP_ADAPTER pAd,
3296 IN UCHAR Bss2040Coexist); 3265 IN UCHAR Bss2040Coexist);
3297#endif // CONFIG_STA_SUPPORT //
3298
3299 3266
3300VOID PeerBSSTranAction( 3267VOID PeerBSSTranAction(
3301 IN PRTMP_ADAPTER pAd, 3268 IN PRTMP_ADAPTER pAd,
@@ -3557,7 +3524,6 @@ PQUEUE_HEADER RTMPCheckTxSwQueue(
3557 IN PRTMP_ADAPTER pAd, 3524 IN PRTMP_ADAPTER pAd,
3558 OUT UCHAR *QueIdx); 3525 OUT UCHAR *QueIdx);
3559 3526
3560#ifdef CONFIG_STA_SUPPORT
3561VOID RTMPReportMicError( 3527VOID RTMPReportMicError(
3562 IN PRTMP_ADAPTER pAd, 3528 IN PRTMP_ADAPTER pAd,
3563 IN PCIPHER_KEY pWpaKey); 3529 IN PCIPHER_KEY pWpaKey);
@@ -3571,7 +3537,6 @@ VOID WpaDisassocApAndBlockAssoc(
3571 IN PVOID FunctionContext, 3537 IN PVOID FunctionContext,
3572 IN PVOID SystemSpecific2, 3538 IN PVOID SystemSpecific2,
3573 IN PVOID SystemSpecific3); 3539 IN PVOID SystemSpecific3);
3574#endif // CONFIG_STA_SUPPORT //
3575 3540
3576NDIS_STATUS RTMPCloneNdisPacket( 3541NDIS_STATUS RTMPCloneNdisPacket(
3577 IN PRTMP_ADAPTER pAd, 3542 IN PRTMP_ADAPTER pAd,
@@ -3711,7 +3676,6 @@ VOID AsicRfTuningExec(
3711 IN PVOID SystemSpecific2, 3676 IN PVOID SystemSpecific2,
3712 IN PVOID SystemSpecific3); 3677 IN PVOID SystemSpecific3);
3713 3678
3714#ifdef CONFIG_STA_SUPPORT
3715VOID AsicSleepThenAutoWakeup( 3679VOID AsicSleepThenAutoWakeup(
3716 IN PRTMP_ADAPTER pAd, 3680 IN PRTMP_ADAPTER pAd,
3717 IN USHORT TbttNumToNextWakeUp); 3681 IN USHORT TbttNumToNextWakeUp);
@@ -3722,7 +3686,6 @@ VOID AsicForceSleep(
3722VOID AsicForceWakeup( 3686VOID AsicForceWakeup(
3723 IN PRTMP_ADAPTER pAd, 3687 IN PRTMP_ADAPTER pAd,
3724 IN BOOLEAN bFromTx); 3688 IN BOOLEAN bFromTx);
3725#endif // CONFIG_STA_SUPPORT //
3726 3689
3727VOID AsicSetBssid( 3690VOID AsicSetBssid(
3728 IN PRTMP_ADAPTER pAd, 3691 IN PRTMP_ADAPTER pAd,
@@ -4468,9 +4431,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(
4468 OUT PQOS_CAPABILITY_PARM pQosCapability, 4431 OUT PQOS_CAPABILITY_PARM pQosCapability,
4469 OUT ULONG *pRalinkIe, 4432 OUT ULONG *pRalinkIe,
4470 OUT UCHAR *pHtCapabilityLen, 4433 OUT UCHAR *pHtCapabilityLen,
4471#ifdef CONFIG_STA_SUPPORT
4472 OUT UCHAR *pPreNHtCapabilityLen, 4434 OUT UCHAR *pPreNHtCapabilityLen,
4473#endif // CONFIG_STA_SUPPORT //
4474 OUT HT_CAPABILITY_IE *pHtCapability, 4435 OUT HT_CAPABILITY_IE *pHtCapability,
4475 OUT UCHAR *AddHtInfoLen, 4436 OUT UCHAR *AddHtInfoLen,
4476 OUT ADD_HT_INFO_IE *AddHtInfo, 4437 OUT ADD_HT_INFO_IE *AddHtInfo,
@@ -4709,12 +4670,10 @@ VOID RTMPCheckRates(
4709 IN OUT UCHAR SupRate[], 4670 IN OUT UCHAR SupRate[],
4710 IN OUT UCHAR *SupRateLen); 4671 IN OUT UCHAR *SupRateLen);
4711 4672
4712#ifdef CONFIG_STA_SUPPORT
4713BOOLEAN RTMPCheckChannel( 4673BOOLEAN RTMPCheckChannel(
4714 IN PRTMP_ADAPTER pAd, 4674 IN PRTMP_ADAPTER pAd,
4715 IN UCHAR CentralChannel, 4675 IN UCHAR CentralChannel,
4716 IN UCHAR Channel); 4676 IN UCHAR Channel);
4717#endif // CONFIG_STA_SUPPORT //
4718 4677
4719BOOLEAN RTMPCheckHt( 4678BOOLEAN RTMPCheckHt(
4720 IN PRTMP_ADAPTER pAd, 4679 IN PRTMP_ADAPTER pAd,
@@ -4959,13 +4918,11 @@ VOID RTMPIndicateWPA2Status(
4959VOID RTMPOPModeSwitching( 4918VOID RTMPOPModeSwitching(
4960 IN PRTMP_ADAPTER pAd); 4919 IN PRTMP_ADAPTER pAd);
4961 4920
4962#ifdef CONFIG_STA_SUPPORT
4963VOID RTMPAddBSSIDCipher( 4921VOID RTMPAddBSSIDCipher(
4964 IN PRTMP_ADAPTER pAd, 4922 IN PRTMP_ADAPTER pAd,
4965 IN UCHAR Aid, 4923 IN UCHAR Aid,
4966 IN PNDIS_802_11_KEY pKey, 4924 IN PNDIS_802_11_KEY pKey,
4967 IN UCHAR CipherAlg); 4925 IN UCHAR CipherAlg);
4968#endif // CONFIG_STA_SUPPORT //
4969 4926
4970#ifdef DOT11_N_SUPPORT 4927#ifdef DOT11_N_SUPPORT
4971VOID RTMPSetHT( 4928VOID RTMPSetHT(
@@ -5892,9 +5849,6 @@ INT Set_HtTxBASize_Proc(
5892 IN PUCHAR arg); 5849 IN PUCHAR arg);
5893#endif // DOT11_N_SUPPORT // 5850#endif // DOT11_N_SUPPORT //
5894 5851
5895
5896
5897#ifdef CONFIG_STA_SUPPORT
5898//Dls , kathy 5852//Dls , kathy
5899VOID RTMPSendDLSTearDownFrame( 5853VOID RTMPSendDLSTearDownFrame(
5900 IN PRTMP_ADAPTER pAd, 5854 IN PRTMP_ADAPTER pAd,
@@ -5927,10 +5881,6 @@ int wext_notify_event_assoc(
5927 IN RTMP_ADAPTER *pAd); 5881 IN RTMP_ADAPTER *pAd);
5928#endif // NATIVE_WPA_SUPPLICANT_SUPPORT // 5882#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
5929 5883
5930#endif // CONFIG_STA_SUPPORT //
5931
5932
5933
5934#ifdef DOT11_N_SUPPORT 5884#ifdef DOT11_N_SUPPORT
5935VOID Handle_BSS_Width_Trigger_Events( 5885VOID Handle_BSS_Width_Trigger_Events(
5936 IN PRTMP_ADAPTER pAd); 5886 IN PRTMP_ADAPTER pAd);
@@ -5990,8 +5940,6 @@ UINT deaggregate_AMSDU_announce(
5990 IN PUCHAR pData, 5940 IN PUCHAR pData,
5991 IN ULONG DataSize); 5941 IN ULONG DataSize);
5992 5942
5993
5994#ifdef CONFIG_STA_SUPPORT
5995// remove LLC and get 802_3 Header 5943// remove LLC and get 802_3 Header
5996#define RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(_pRxBlk, _pHeader802_3) \ 5944#define RTMP_802_11_REMOVE_LLC_AND_CONVERT_TO_802_3(_pRxBlk, _pHeader802_3) \
5997{ \ 5945{ \
@@ -6022,8 +5970,6 @@ UINT deaggregate_AMSDU_announce(
6022 CONVERT_TO_802_3(_pHeader802_3, _pDA, _pSA, _pRxBlk->pData, \ 5970 CONVERT_TO_802_3(_pHeader802_3, _pDA, _pSA, _pRxBlk->pData, \
6023 _pRxBlk->DataSize, _pRemovedLLCSNAP); \ 5971 _pRxBlk->DataSize, _pRemovedLLCSNAP); \
6024} 5972}
6025#endif // CONFIG_STA_SUPPORT //
6026
6027 5973
6028BOOLEAN APFowardWirelessStaToWirelessSta( 5974BOOLEAN APFowardWirelessStaToWirelessSta(
6029 IN PRTMP_ADAPTER pAd, 5975 IN PRTMP_ADAPTER pAd,
@@ -6040,13 +5986,9 @@ VOID Sta_Announce_or_Forward_802_3_Packet(
6040 IN PNDIS_PACKET pPacket, 5986 IN PNDIS_PACKET pPacket,
6041 IN UCHAR FromWhichBSSID); 5987 IN UCHAR FromWhichBSSID);
6042 5988
6043
6044#ifdef CONFIG_STA_SUPPORT
6045#define ANNOUNCE_OR_FORWARD_802_3_PACKET(_pAd, _pPacket, _FromWhichBSS)\ 5989#define ANNOUNCE_OR_FORWARD_802_3_PACKET(_pAd, _pPacket, _FromWhichBSS)\
6046 Sta_Announce_or_Forward_802_3_Packet(_pAd, _pPacket, _FromWhichBSS); 5990 Sta_Announce_or_Forward_802_3_Packet(_pAd, _pPacket, _FromWhichBSS);
6047 //announce_802_3_packet(_pAd, _pPacket); 5991 //announce_802_3_packet(_pAd, _pPacket);
6048#endif // CONFIG_STA_SUPPORT //
6049
6050 5992
6051PNDIS_PACKET DuplicatePacket( 5993PNDIS_PACKET DuplicatePacket(
6052 IN PRTMP_ADAPTER pAd, 5994 IN PRTMP_ADAPTER pAd,
@@ -6089,8 +6031,6 @@ PNDIS_PACKET RTMPDeFragmentDataFrame(
6089 IN RX_BLK *pRxBlk); 6031 IN RX_BLK *pRxBlk);
6090 6032
6091//////////////////////////////////////// 6033////////////////////////////////////////
6092
6093#ifdef CONFIG_STA_SUPPORT
6094enum { 6034enum {
6095 DIDmsg_lnxind_wlansniffrm = 0x00000044, 6035 DIDmsg_lnxind_wlansniffrm = 0x00000044,
6096 DIDmsg_lnxind_wlansniffrm_hosttime = 0x00010044, 6036 DIDmsg_lnxind_wlansniffrm_hosttime = 0x00010044,
@@ -6203,7 +6143,6 @@ struct iw_statistics *rt28xx_get_wireless_stats(
6203VOID RTMPSetDesiredRates( 6143VOID RTMPSetDesiredRates(
6204 IN PRTMP_ADAPTER pAdapter, 6144 IN PRTMP_ADAPTER pAdapter,
6205 IN LONG Rates); 6145 IN LONG Rates);
6206#endif // CONFIG_STA_SUPPORT //
6207 6146
6208INT Set_FixedTxMode_Proc( 6147INT Set_FixedTxMode_Proc(
6209 IN PRTMP_ADAPTER pAd, 6148 IN PRTMP_ADAPTER pAd,
@@ -6285,13 +6224,10 @@ INT rt28xx_ioctl(
6285 IN OUT struct ifreq *rq, 6224 IN OUT struct ifreq *rq,
6286 IN INT cmd); 6225 IN INT cmd);
6287 6226
6288
6289#ifdef CONFIG_STA_SUPPORT
6290INT rt28xx_sta_ioctl( 6227INT rt28xx_sta_ioctl(
6291 IN struct net_device *net_dev, 6228 IN struct net_device *net_dev,
6292 IN OUT struct ifreq *rq, 6229 IN OUT struct ifreq *rq,
6293 IN INT cmd); 6230 IN INT cmd);
6294#endif // CONFIG_STA_SUPPORT //
6295 6231
6296BOOLEAN RT28XXSecurityKeyAdd( 6232BOOLEAN RT28XXSecurityKeyAdd(
6297 IN PRTMP_ADAPTER pAd, 6233 IN PRTMP_ADAPTER pAd,
@@ -6818,7 +6754,6 @@ PCHAR RTMPGetRalinkEncryModeStr(
6818 IN USHORT encryMode); 6754 IN USHORT encryMode);
6819////////////////////////////////////// 6755//////////////////////////////////////
6820 6756
6821#ifdef CONFIG_STA_SUPPORT
6822VOID AsicStaBbpTuning( 6757VOID AsicStaBbpTuning(
6823 IN PRTMP_ADAPTER pAd); 6758 IN PRTMP_ADAPTER pAd);
6824 6759
@@ -6829,7 +6764,6 @@ BOOLEAN StaAddMacTableEntry(
6829 IN HT_CAPABILITY_IE *pHtCapability, 6764 IN HT_CAPABILITY_IE *pHtCapability,
6830 IN UCHAR HtCapabilityLen, 6765 IN UCHAR HtCapabilityLen,
6831 IN USHORT CapabilityInfo); 6766 IN USHORT CapabilityInfo);
6832#endif // CONFIG_STA_SUPPORT //
6833 6767
6834void RTMP_IndicateMediaState( 6768void RTMP_IndicateMediaState(
6835 IN PRTMP_ADAPTER pAd); 6769 IN PRTMP_ADAPTER pAd);
diff --git a/drivers/staging/rt3070/rtmp_def.h b/drivers/staging/rt3070/rtmp_def.h
index 60827c9fbab..277922924f9 100644
--- a/drivers/staging/rt3070/rtmp_def.h
+++ b/drivers/staging/rt3070/rtmp_def.h
@@ -1392,7 +1392,6 @@
1392 1392
1393// End - WIRELESS EVENTS definition 1393// End - WIRELESS EVENTS definition
1394 1394
1395#ifdef CONFIG_STA_SUPPORT
1396// definition for DLS, kathy 1395// definition for DLS, kathy
1397#define MAX_NUM_OF_INIT_DLS_ENTRY 1 1396#define MAX_NUM_OF_INIT_DLS_ENTRY 1
1398#define MAX_NUM_OF_DLS_ENTRY MAX_NUMBER_OF_DLS_ENTRY 1397#define MAX_NUM_OF_DLS_ENTRY MAX_NUMBER_OF_DLS_ENTRY
@@ -1410,7 +1409,6 @@
1410/* Maximum size of the ESSID and pAd->nickname strings */ 1409/* Maximum size of the ESSID and pAd->nickname strings */
1411#define IW_ESSID_MAX_SIZE 32 1410#define IW_ESSID_MAX_SIZE 32
1412#endif 1411#endif
1413#endif // CONFIG_STA_SUPPORT //
1414 1412
1415#ifdef MCAST_RATE_SPECIFIC 1413#ifdef MCAST_RATE_SPECIFIC
1416#define MCAST_DISABLE 0 1414#define MCAST_DISABLE 0
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 03:31:37 -0400