aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorJim Lieb <lieb@canonical.com>2009-07-30 13:27:21 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:02:07 -0400
commit7e809a9b10ab5ee985e23dea537e0236f026d1ca (patch)
tree450b5cda1963436a6202cc88661875e6250753b0 /drivers/staging
parentd899d403862863cf2230432e18e7b294a517fd96 (diff)
Staging: vt6655 textual cleanup in prep for driver merge
The vt6655 and vt6656 drivers are from a common origin but have drifted apart with minor textual differences. There are two changes: s/DEVICE_PRT/DBG_PRT/g and s/byPktTyp/byPktType/g This significantly reduces the differences between the two file sets in preparation to merging the common code. A few whitespace and text bits were also adjusted. Signed-off-by: Jim Lieb <lieb@canonical.com> Cc: Forest Bond <forest@alittletooquiet.net> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/vt6655/80211mgr.c12
-rw-r--r--drivers/staging/vt6655/IEEE11h.c4
-rw-r--r--drivers/staging/vt6655/baseband.c26
-rw-r--r--drivers/staging/vt6655/bssdb.c40
-rw-r--r--drivers/staging/vt6655/card.c32
-rw-r--r--drivers/staging/vt6655/datarate.c8
-rw-r--r--drivers/staging/vt6655/device.h8
-rw-r--r--drivers/staging/vt6655/device_main.c224
-rw-r--r--drivers/staging/vt6655/dpc.c106
-rw-r--r--drivers/staging/vt6655/hostap.c74
-rw-r--r--drivers/staging/vt6655/ioctl.c68
-rw-r--r--drivers/staging/vt6655/iwctl.c128
-rw-r--r--drivers/staging/vt6655/key.c112
-rw-r--r--drivers/staging/vt6655/mac.c56
-rw-r--r--drivers/staging/vt6655/mib.c26
-rw-r--r--drivers/staging/vt6655/power.c12
-rw-r--r--drivers/staging/vt6655/rxtx.c360
-rw-r--r--drivers/staging/vt6655/wcmd.c74
-rw-r--r--drivers/staging/vt6655/wctl.c6
-rw-r--r--drivers/staging/vt6655/wmgr.c204
-rw-r--r--drivers/staging/vt6655/wpa.c22
-rw-r--r--drivers/staging/vt6655/wpa2.c14
-rw-r--r--drivers/staging/vt6655/wpactl.c60
-rw-r--r--drivers/staging/vt6655/wroute.c14
24 files changed, 846 insertions, 844 deletions
diff --git a/drivers/staging/vt6655/80211mgr.c b/drivers/staging/vt6655/80211mgr.c
index 5d6cd682455..54fc81ea96f 100644
--- a/drivers/staging/vt6655/80211mgr.c
+++ b/drivers/staging/vt6655/80211mgr.c
@@ -236,7 +236,7 @@ vMgrDecodeBeacon(
236 break; 236 break;
237 237
238 default: 238 default:
239 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in beacon decode.\n", pItem->byElementID); 239 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in beacon decode.\n", pItem->byElementID);
240 break; 240 break;
241 241
242 } 242 }
@@ -431,7 +431,7 @@ vMgrDecodeAssocRequest(
431 break; 431 break;
432 432
433 default: 433 default:
434 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n", 434 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in assocreq decode.\n",
435 pItem->byElementID); 435 pItem->byElementID);
436 break; 436 break;
437 } 437 }
@@ -509,7 +509,7 @@ vMgrDecodeAssocResponse(
509 509
510 if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) { 510 if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
511 pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem; 511 pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
512 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem); 512 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);
513 } 513 }
514 else { 514 else {
515 pFrame->pExtSuppRates = NULL; 515 pFrame->pExtSuppRates = NULL;
@@ -610,7 +610,7 @@ vMgrDecodeReassocRequest(
610 pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem; 610 pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
611 break; 611 break;
612 default: 612 default:
613 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n", 613 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Unrecognized EID=%dd in reassocreq decode.\n",
614 pItem->byElementID); 614 pItem->byElementID);
615 break; 615 break;
616 } 616 }
@@ -685,7 +685,7 @@ vMgrDecodeProbeRequest(
685 break; 685 break;
686 686
687 default: 687 default:
688 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in probereq\n", pItem->byElementID); 688 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in probereq\n", pItem->byElementID);
689 break; 689 break;
690 } 690 }
691 691
@@ -841,7 +841,7 @@ vMgrDecodeProbeResponse(
841 break; 841 break;
842 842
843 default: 843 default:
844 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in proberesp\n", pItem->byElementID); 844 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Bad EID=%dd in proberesp\n", pItem->byElementID);
845 break; 845 break;
846 } 846 }
847 847
diff --git a/drivers/staging/vt6655/IEEE11h.c b/drivers/staging/vt6655/IEEE11h.c
index b0f4eb5af89..e1addc6d700 100644
--- a/drivers/staging/vt6655/IEEE11h.c
+++ b/drivers/staging/vt6655/IEEE11h.c
@@ -271,11 +271,11 @@ IEEE11hbMgrRxAction (
271 } 271 }
272 break; 272 break;
273 default: 273 default:
274 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Action = %d\n", pAction->byAction); 274 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Action = %d\n", pAction->byAction);
275 break; 275 break;
276 } 276 }
277 } else { 277 } else {
278 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Category = %d\n", pAction->byCategory); 278 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown Category = %d\n", pAction->byCategory);
279 pAction->byCategory |= 0x80; 279 pAction->byCategory |= 0x80;
280 280
281 //return (CARDbSendPacket(pMgmt->pAdapter, pAction, PKT_TYPE_802_11_MNG, uLength)); 281 //return (CARDbSendPacket(pMgmt->pAdapter, pAction, PKT_TYPE_802_11_MNG, uLength));
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index bc6db869953..30c707d127f 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -2050,7 +2050,7 @@ BOOL BBbReadEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, PBYTE pbyData)
2050 2050
2051 if (ww == W_MAX_TIMEOUT) { 2051 if (ww == W_MAX_TIMEOUT) {
2052 DBG_PORT80(0x30); 2052 DBG_PORT80(0x30);
2053 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x30)\n"); 2053 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x30)\n");
2054 return FALSE; 2054 return FALSE;
2055 } 2055 }
2056 return TRUE; 2056 return TRUE;
@@ -2092,7 +2092,7 @@ BOOL BBbWriteEmbeded (DWORD_PTR dwIoBase, BYTE byBBAddr, BYTE byData)
2092 2092
2093 if (ww == W_MAX_TIMEOUT) { 2093 if (ww == W_MAX_TIMEOUT) {
2094 DBG_PORT80(0x31); 2094 DBG_PORT80(0x31);
2095 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x31)\n"); 2095 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x31)\n");
2096 return FALSE; 2096 return FALSE;
2097 } 2097 }
2098 return TRUE; 2098 return TRUE;
@@ -2807,24 +2807,24 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
2807 return; 2807 return;
2808 } 2808 }
2809 pDevice->uDiversityCnt++; 2809 pDevice->uDiversityCnt++;
2810 // DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->uDiversityCnt = %d\n", (int)pDevice->uDiversityCnt); 2810 // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->uDiversityCnt = %d\n", (int)pDevice->uDiversityCnt);
2811 2811
2812 pDevice->uNumSQ3[byRxRate]++; 2812 pDevice->uNumSQ3[byRxRate]++;
2813 2813
2814 if (pDevice->byAntennaState == 0) { 2814 if (pDevice->byAntennaState == 0) {
2815 2815
2816 if (pDevice->uDiversityCnt > pDevice->ulDiversityNValue) { 2816 if (pDevice->uDiversityCnt > pDevice->ulDiversityNValue) {
2817 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ulDiversityNValue=[%d],54M-[%d]\n", 2817 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ulDiversityNValue=[%d],54M-[%d]\n",
2818 (int)pDevice->ulDiversityNValue, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate]); 2818 (int)pDevice->ulDiversityNValue, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate]);
2819 2819
2820 if (pDevice->uNumSQ3[pDevice->wAntDiversityMaxRate] < pDevice->uDiversityCnt/2) { 2820 if (pDevice->uNumSQ3[pDevice->wAntDiversityMaxRate] < pDevice->uDiversityCnt/2) {
2821 2821
2822 pDevice->ulRatio_State0 = s_ulGetRatio(pDevice); 2822 pDevice->ulRatio_State0 = s_ulGetRatio(pDevice);
2823 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State0, rate = [%08x]\n", (int)pDevice->ulRatio_State0); 2823 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State0, rate = [%08x]\n", (int)pDevice->ulRatio_State0);
2824 2824
2825 if ( pDevice->byTMax == 0 ) 2825 if ( pDevice->byTMax == 0 )
2826 return; 2826 return;
2827 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1.[%08x], uNumSQ3[%d]=%d, %d\n", 2827 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1.[%08x], uNumSQ3[%d]=%d, %d\n",
2828 (int)pDevice->ulRatio_State0, (int)pDevice->wAntDiversityMaxRate, 2828 (int)pDevice->ulRatio_State0, (int)pDevice->wAntDiversityMaxRate,
2829 (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); 2829 (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);
2830#ifdef PLICE_DEBUG 2830#ifdef PLICE_DEBUG
@@ -2852,11 +2852,11 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
2852 del_timer(&pDevice->TimerSQ3Tmax1); 2852 del_timer(&pDevice->TimerSQ3Tmax1);
2853 2853
2854 pDevice->ulRatio_State1 = s_ulGetRatio(pDevice); 2854 pDevice->ulRatio_State1 = s_ulGetRatio(pDevice);
2855 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RX:SQ3_State1, rate0 = %08x,rate1 = %08x\n", 2855 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RX:SQ3_State1, rate0 = %08x,rate1 = %08x\n",
2856 (int)pDevice->ulRatio_State0,(int)pDevice->ulRatio_State1); 2856 (int)pDevice->ulRatio_State0,(int)pDevice->ulRatio_State1);
2857 2857
2858 if (pDevice->ulRatio_State1 < pDevice->ulRatio_State0) { 2858 if (pDevice->ulRatio_State1 < pDevice->ulRatio_State0) {
2859 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n", 2859 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n",
2860 (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, 2860 (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1,
2861 (int)pDevice->wAntDiversityMaxRate, 2861 (int)pDevice->wAntDiversityMaxRate,
2862 (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); 2862 (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);
@@ -2896,12 +2896,12 @@ TimerSQ3CallBack (
2896{ 2896{
2897 PSDevice pDevice = (PSDevice)hDeviceContext; 2897 PSDevice pDevice = (PSDevice)hDeviceContext;
2898 2898
2899 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack..."); 2899 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack...");
2900 2900
2901 2901
2902 spin_lock_irq(&pDevice->lock); 2902 spin_lock_irq(&pDevice->lock);
2903 2903
2904 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"3.[%08x][%08x], %d\n",(int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->uDiversityCnt); 2904 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"3.[%08x][%08x], %d\n",(int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->uDiversityCnt);
2905#ifdef PLICE_DEBUG 2905#ifdef PLICE_DEBUG
2906 //printk("TimerSQ3CallBack1:call s_vChangeAntenna\n"); 2906 //printk("TimerSQ3CallBack1:call s_vChangeAntenna\n");
2907#endif 2907#endif
@@ -2946,7 +2946,7 @@ TimerState1CallBack (
2946{ 2946{
2947 PSDevice pDevice = (PSDevice)hDeviceContext; 2947 PSDevice pDevice = (PSDevice)hDeviceContext;
2948 2948
2949 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerState1CallBack..."); 2949 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerState1CallBack...");
2950 2950
2951 spin_lock_irq(&pDevice->lock); 2951 spin_lock_irq(&pDevice->lock);
2952 if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) { 2952 if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) {
@@ -2961,11 +2961,11 @@ TimerState1CallBack (
2961 add_timer(&pDevice->TimerSQ3Tmax2); 2961 add_timer(&pDevice->TimerSQ3Tmax2);
2962 } else { 2962 } else {
2963 pDevice->ulRatio_State1 = s_ulGetRatio(pDevice); 2963 pDevice->ulRatio_State1 = s_ulGetRatio(pDevice);
2964 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State1, rate0 = %08x,rate1 = %08x\n", 2964 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SQ3_State1, rate0 = %08x,rate1 = %08x\n",
2965 (int)pDevice->ulRatio_State0,(int)pDevice->ulRatio_State1); 2965 (int)pDevice->ulRatio_State0,(int)pDevice->ulRatio_State1);
2966 2966
2967 if ( pDevice->ulRatio_State1 < pDevice->ulRatio_State0 ) { 2967 if ( pDevice->ulRatio_State1 < pDevice->ulRatio_State0 ) {
2968 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n", 2968 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.[%08x][%08x], uNumSQ3[%d]=%d, %d\n",
2969 (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, 2969 (int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1,
2970 (int)pDevice->wAntDiversityMaxRate, 2970 (int)pDevice->wAntDiversityMaxRate,
2971 (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt); 2971 (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate], (int)pDevice->uDiversityCnt);
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c
index 6eb0798d58d..3833ea63415 100644
--- a/drivers/staging/vt6655/bssdb.c
+++ b/drivers/staging/vt6655/bssdb.c
@@ -183,7 +183,7 @@ BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};
183 UINT ii = 0; 183 UINT ii = 0;
184// UINT jj = 0; //DavidWang 184// UINT jj = 0; //DavidWang
185 if (pbyDesireBSSID != NULL) { 185 if (pbyDesireBSSID != NULL) {
186 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n", 186 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",
187 *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2), 187 *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),
188 *(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5)); 188 *(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5));
189 if ((!IS_BROADCAST_ADDRESS(pbyDesireBSSID)) && 189 if ((!IS_BROADCAST_ADDRESS(pbyDesireBSSID)) &&
@@ -252,7 +252,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE;
252 ((pMgmt->eConfigMode == WMAC_CONFIG_ESS_STA) && WLAN_GET_CAP_INFO_IBSS(pCurrBSS->wCapInfo)) 252 ((pMgmt->eConfigMode == WMAC_CONFIG_ESS_STA) && WLAN_GET_CAP_INFO_IBSS(pCurrBSS->wCapInfo))
253 ) { 253 ) {
254 // Type not match skip this BSS 254 // Type not match skip this BSS
255 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSS type mismatch.... Config[%d] BSS[0x%04x]\n", pMgmt->eConfigMode, pCurrBSS->wCapInfo); 255 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSS type mismatch.... Config[%d] BSS[0x%04x]\n", pMgmt->eConfigMode, pCurrBSS->wCapInfo);
256 continue; 256 continue;
257 } 257 }
258 258
@@ -260,7 +260,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE;
260 if (((ePhyType == PHY_TYPE_11A) && (PHY_TYPE_11A != pCurrBSS->eNetworkTypeInUse)) || 260 if (((ePhyType == PHY_TYPE_11A) && (PHY_TYPE_11A != pCurrBSS->eNetworkTypeInUse)) ||
261 ((ePhyType != PHY_TYPE_11A) && (PHY_TYPE_11A == pCurrBSS->eNetworkTypeInUse))) { 261 ((ePhyType != PHY_TYPE_11A) && (PHY_TYPE_11A == pCurrBSS->eNetworkTypeInUse))) {
262 // PhyType not match skip this BSS 262 // PhyType not match skip this BSS
263 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Physical type mismatch.... ePhyType[%d] BSS[%d]\n", ePhyType, pCurrBSS->eNetworkTypeInUse); 263 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Physical type mismatch.... ePhyType[%d] BSS[%d]\n", ePhyType, pCurrBSS->eNetworkTypeInUse);
264 continue; 264 continue;
265 } 265 }
266 } 266 }
@@ -450,7 +450,7 @@ BSSbInsertToBSSList (
450 } 450 }
451 451
452 if (ii == MAX_BSS_NUM){ 452 if (ii == MAX_BSS_NUM){
453 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Get free KnowBSS node failed.\n"); 453 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Get free KnowBSS node failed.\n");
454 return FALSE; 454 return FALSE;
455 } 455 }
456 // save the BSS info 456 // save the BSS info
@@ -476,7 +476,7 @@ BSSbInsertToBSSList (
476 if (pExtSuppRates->len > WLAN_RATES_MAXLEN) 476 if (pExtSuppRates->len > WLAN_RATES_MAXLEN)
477 pExtSuppRates->len = WLAN_RATES_MAXLEN; 477 pExtSuppRates->len = WLAN_RATES_MAXLEN;
478 memcpy(pBSSList->abyExtSuppRates, pExtSuppRates, pExtSuppRates->len + WLAN_IEHDR_LEN); 478 memcpy(pBSSList->abyExtSuppRates, pExtSuppRates, pExtSuppRates->len + WLAN_IEHDR_LEN);
479 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbInsertToBSSList: pExtSuppRates->len = %d\n", pExtSuppRates->len); 479 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbInsertToBSSList: pExtSuppRates->len = %d\n", pExtSuppRates->len);
480 480
481 } else { 481 } else {
482 memset(pBSSList->abyExtSuppRates, 0, WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1); 482 memset(pBSSList->abyExtSuppRates, 0, WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1);
@@ -669,7 +669,7 @@ BSSbUpdateToBSSList (
669 pBSSList->wCapInfo = cpu_to_le16(wCapInfo); 669 pBSSList->wCapInfo = cpu_to_le16(wCapInfo);
670 pBSSList->uClearCount = 0; 670 pBSSList->uClearCount = 0;
671 pBSSList->uChannel = byCurrChannel; 671 pBSSList->uChannel = byCurrChannel;
672// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbUpdateToBSSList: pBSSList->uChannel: %d\n", pBSSList->uChannel); 672// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbUpdateToBSSList: pBSSList->uChannel: %d\n", pBSSList->uChannel);
673 673
674 if (pSSID->len > WLAN_SSID_MAXLEN) 674 if (pSSID->len > WLAN_SSID_MAXLEN)
675 pSSID->len = WLAN_SSID_MAXLEN; 675 pSSID->len = WLAN_SSID_MAXLEN;
@@ -872,7 +872,7 @@ BSSvCreateOneNode(
872 // if not found replace uInActiveCount is largest one. 872 // if not found replace uInActiveCount is largest one.
873 if ( ii == (MAX_NODE_NUM + 1)) { 873 if ( ii == (MAX_NODE_NUM + 1)) {
874 *puNodeIndex = SelectIndex; 874 *puNodeIndex = SelectIndex;
875 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Replace inactive node = %d\n", SelectIndex); 875 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Replace inactive node = %d\n", SelectIndex);
876 // clear ps buffer 876 // clear ps buffer
877 if (pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue.next != NULL) { 877 if (pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue.next != NULL) {
878 while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue)) != NULL) 878 while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue)) != NULL)
@@ -890,7 +890,7 @@ BSSvCreateOneNode(
890 skb_queue_head_init(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue); 890 skb_queue_head_init(&pMgmt->sNodeDBTable[*puNodeIndex].sTxPSQueue);
891 pMgmt->sNodeDBTable[*puNodeIndex].byAuthSequence = 0; 891 pMgmt->sNodeDBTable[*puNodeIndex].byAuthSequence = 0;
892 pMgmt->sNodeDBTable[*puNodeIndex].wEnQueueCnt = 0; 892 pMgmt->sNodeDBTable[*puNodeIndex].wEnQueueCnt = 0;
893 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create node index = %d\n", ii); 893 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create node index = %d\n", ii);
894 return; 894 return;
895}; 895};
896 896
@@ -982,7 +982,7 @@ BSSvUpdateAPNode(
982#endif 982#endif
983 // Auto rate fallback function initiation. 983 // Auto rate fallback function initiation.
984 // RATEbInit(pDevice); 984 // RATEbInit(pDevice);
985 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pMgmt->sNodeDBTable[0].wTxDataRate = %d \n", pMgmt->sNodeDBTable[0].wTxDataRate); 985 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pMgmt->sNodeDBTable[0].wTxDataRate = %d \n", pMgmt->sNodeDBTable[0].wTxDataRate);
986 986
987}; 987};
988 988
@@ -1168,7 +1168,7 @@ start:
1168 if (ii > 0) { 1168 if (ii > 0) {
1169 if (pMgmt->sNodeDBTable[ii].uInActiveCount > MAX_INACTIVE_COUNT) { 1169 if (pMgmt->sNodeDBTable[ii].uInActiveCount > MAX_INACTIVE_COUNT) {
1170 BSSvRemoveOneNode(pDevice, ii); 1170 BSSvRemoveOneNode(pDevice, ii);
1171 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO 1171 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO
1172 "Inactive timeout [%d] sec, STA index = [%d] remove\n", MAX_INACTIVE_COUNT, ii); 1172 "Inactive timeout [%d] sec, STA index = [%d] remove\n", MAX_INACTIVE_COUNT, ii);
1173 continue; 1173 continue;
1174 } 1174 }
@@ -1227,11 +1227,11 @@ start:
1227 1227
1228 // check if pending PS queue 1228 // check if pending PS queue
1229 if (pMgmt->sNodeDBTable[ii].wEnQueueCnt != 0) { 1229 if (pMgmt->sNodeDBTable[ii].wEnQueueCnt != 0) {
1230 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index= %d, Queue = %d pending \n", 1230 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index= %d, Queue = %d pending \n",
1231 ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt); 1231 ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt);
1232 if ((ii >0) && (pMgmt->sNodeDBTable[ii].wEnQueueCnt > 15)) { 1232 if ((ii >0) && (pMgmt->sNodeDBTable[ii].wEnQueueCnt > 15)) {
1233 BSSvRemoveOneNode(pDevice, ii); 1233 BSSvRemoveOneNode(pDevice, ii);
1234 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Pending many queues PS STA Index = %d remove \n", ii); 1234 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Pending many queues PS STA Index = %d remove \n", ii);
1235 continue; 1235 continue;
1236 } 1236 }
1237 } 1237 }
@@ -1305,7 +1305,7 @@ start:
1305 (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)) { 1305 (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)) {
1306 1306
1307 if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS 1307 if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS
1308 // DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount); 1308 // DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount);
1309 //if (pDevice->bUpdateBBVGA) { 1309 //if (pDevice->bUpdateBBVGA) {
1310 // s_vCheckSensitivity((HANDLE) pDevice); 1310 // s_vCheckSensitivity((HANDLE) pDevice);
1311 //} 1311 //}
@@ -1327,7 +1327,7 @@ start:
1327 netif_stop_queue(pDevice->dev); 1327 netif_stop_queue(pDevice->dev);
1328 pDevice->bLinkPass = FALSE; 1328 pDevice->bLinkPass = FALSE;
1329 pDevice->bRoaming = TRUE; 1329 pDevice->bRoaming = TRUE;
1330 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount); 1330 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
1331 if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) { 1331 if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
1332 wpahdr = (viawget_wpa_header *)pDevice->skb->data; 1332 wpahdr = (viawget_wpa_header *)pDevice->skb->data;
1333 wpahdr->type = VIAWGET_DISASSOC_MSG; 1333 wpahdr->type = VIAWGET_DISASSOC_MSG;
@@ -1368,7 +1368,7 @@ start:
1368 //mike use old encryption status for wpa reauthen 1368 //mike use old encryption status for wpa reauthen
1369 if(pDevice->bWPADEVUp) 1369 if(pDevice->bWPADEVUp)
1370 pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus; 1370 pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus;
1371 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming ...\n"); 1371 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming ...\n");
1372 BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); 1372 BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass);
1373 pMgmt->eScanType = WMAC_SCAN_ACTIVE; 1373 pMgmt->eScanType = WMAC_SCAN_ACTIVE;
1374 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); 1374 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
@@ -1385,7 +1385,7 @@ start:
1385 pDevice->uAutoReConnectTime++; 1385 pDevice->uAutoReConnectTime++;
1386 } 1386 }
1387 else { 1387 else {
1388 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scaning ...\n"); 1388 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scaning ...\n");
1389 pMgmt->eScanType = WMAC_SCAN_ACTIVE; 1389 pMgmt->eScanType = WMAC_SCAN_ACTIVE;
1390 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL); 1390 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
1391 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL); 1391 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL);
@@ -1398,7 +1398,7 @@ start:
1398 s_vCheckPreEDThreshold((HANDLE)pDevice); 1398 s_vCheckPreEDThreshold((HANDLE)pDevice);
1399 } 1399 }
1400 if (pMgmt->sNodeDBTable[0].uInActiveCount >=ADHOC_LOST_BEACON_COUNT) { 1400 if (pMgmt->sNodeDBTable[0].uInActiveCount >=ADHOC_LOST_BEACON_COUNT) {
1401 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount); 1401 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
1402 pMgmt->sNodeDBTable[0].uInActiveCount = 0; 1402 pMgmt->sNodeDBTable[0].uInActiveCount = 0;
1403 pMgmt->eCurrState = WMAC_STATE_STARTED; 1403 pMgmt->eCurrState = WMAC_STATE_STARTED;
1404 netif_stop_queue(pDevice->dev); 1404 netif_stop_queue(pDevice->dev);
@@ -1474,7 +1474,7 @@ BSSvUpdateNodeTxCounter(
1474////#endif 1474////#endif
1475 // Only Unicast using support rates 1475 // Only Unicast using support rates
1476 if (pTxBufHead->wFIFOCtl & FIFOCTL_NEEDACK) { 1476 if (pTxBufHead->wFIFOCtl & FIFOCTL_NEEDACK) {
1477 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1); 1477 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wRate %04X, byTsr0 %02X, byTsr1 %02X\n", wRate, byTsr0, byTsr1);
1478 if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) { 1478 if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) {
1479 pMgmt->sNodeDBTable[0].uTxAttempts += 1; 1479 pMgmt->sNodeDBTable[0].uTxAttempts += 1;
1480 if ((byTsr1 & TSR1_TERR) == 0) { 1480 if ((byTsr1 & TSR1_TERR) == 0) {
@@ -1641,7 +1641,7 @@ BSSvClearNodeDBTable(
1641 // check if sTxPSQueue has been initial 1641 // check if sTxPSQueue has been initial
1642 if (pMgmt->sNodeDBTable[ii].sTxPSQueue.next != NULL) { 1642 if (pMgmt->sNodeDBTable[ii].sTxPSQueue.next != NULL) {
1643 while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL){ 1643 while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL){
1644 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS skb != NULL %d\n", ii); 1644 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS skb != NULL %d\n", ii);
1645 dev_kfree_skb(skb); 1645 dev_kfree_skb(skb);
1646 } 1646 }
1647 } 1647 }
@@ -1683,7 +1683,7 @@ VOID s_vCheckSensitivity(
1683 if (uNumofdBm > 0) { 1683 if (uNumofdBm > 0) {
1684 LocalldBmAverage = LocalldBmAverage/uNumofdBm; 1684 LocalldBmAverage = LocalldBmAverage/uNumofdBm;
1685 for (ii=0;ii<BB_VGA_LEVEL;ii++) { 1685 for (ii=0;ii<BB_VGA_LEVEL;ii++) {
1686 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LocalldBmAverage:%ld, %ld %02x\n", LocalldBmAverage, pDevice->ldBmThreshold[ii], pDevice->abyBBVGA[ii]); 1686 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LocalldBmAverage:%ld, %ld %02x\n", LocalldBmAverage, pDevice->ldBmThreshold[ii], pDevice->abyBBVGA[ii]);
1687 if (LocalldBmAverage < pDevice->ldBmThreshold[ii]) { 1687 if (LocalldBmAverage < pDevice->ldBmThreshold[ii]) {
1688 pDevice->byBBVGANew = pDevice->abyBBVGA[ii]; 1688 pDevice->byBBVGANew = pDevice->abyBBVGA[ii];
1689 break; 1689 break;
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 723f44e0bba..632c3c2c082 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -837,7 +837,7 @@ BOOL CARDbSetChannel (PVOID pDeviceHandler, UINT uConnectionChannel)
837 RFvWriteWakeProgSyn(pDevice->PortOffset, pDevice->byRFType, uConnectionChannel); 837 RFvWriteWakeProgSyn(pDevice->PortOffset, pDevice->byRFType, uConnectionChannel);
838 838
839 839
840 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDbSetMediaChannel: %d\n", (BYTE)uConnectionChannel); 840 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDbSetMediaChannel: %d\n", (BYTE)uConnectionChannel);
841 BBvSoftwareReset(pDevice->PortOffset); 841 BBvSoftwareReset(pDevice->PortOffset);
842 842
843 if (pDevice->byLocalID > REV_ID_VT3253_B1) { 843 if (pDevice->byLocalID > REV_ID_VT3253_B1) {
@@ -1347,14 +1347,14 @@ BOOL CARDbSetBSSID(PVOID pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode)
1347 MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID); 1347 MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);
1348 pDevice->bBSSIDFilter = FALSE; 1348 pDevice->bBSSIDFilter = FALSE;
1349 pDevice->byRxMode &= ~RCR_BSSID; 1349 pDevice->byRxMode &= ~RCR_BSSID;
1350 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode ); 1350 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode );
1351 } else { 1351 } else {
1352 if (IS_NULL_ADDRESS(pDevice->abyBSSID) == FALSE) { 1352 if (IS_NULL_ADDRESS(pDevice->abyBSSID) == FALSE) {
1353 MACvRegBitsOn(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID); 1353 MACvRegBitsOn(pDevice->PortOffset, MAC_REG_RCR, RCR_BSSID);
1354 pDevice->bBSSIDFilter = TRUE; 1354 pDevice->bBSSIDFilter = TRUE;
1355 pDevice->byRxMode |= RCR_BSSID; 1355 pDevice->byRxMode |= RCR_BSSID;
1356 } 1356 }
1357 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: rx_mode = %x\n", pDevice->byRxMode ); 1357 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: rx_mode = %x\n", pDevice->byRxMode );
1358 } 1358 }
1359 // Adopt BSS state in Adapter Device Object 1359 // Adopt BSS state in Adapter Device Object
1360 pDevice->eOPMode = eOPMode; 1360 pDevice->eOPMode = eOPMode;
@@ -1444,7 +1444,7 @@ CARDbPowerDown(
1444 } 1444 }
1445 1445
1446 MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_GO2DOZE); 1446 MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_GO2DOZE);
1447 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Go to Doze ZZZZZZZZZZZZZZZ\n"); 1447 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Go to Doze ZZZZZZZZZZZZZZZ\n");
1448 return TRUE; 1448 return TRUE;
1449} 1449}
1450 1450
@@ -1590,17 +1590,17 @@ CARDbAdd_PMKID_Candidate (
1590 PPMKID_CANDIDATE pCandidateList; 1590 PPMKID_CANDIDATE pCandidateList;
1591 UINT ii = 0; 1591 UINT ii = 0;
1592 1592
1593 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); 1593 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
1594 1594
1595 if (pDevice->gsPMKIDCandidate.NumCandidates >= MAX_PMKIDLIST) { 1595 if (pDevice->gsPMKIDCandidate.NumCandidates >= MAX_PMKIDLIST) {
1596 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 3\n"); 1596 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 3\n");
1597 ZERO_MEMORY(&pDevice->gsPMKIDCandidate, sizeof(SPMKIDCandidateEvent)); 1597 ZERO_MEMORY(&pDevice->gsPMKIDCandidate, sizeof(SPMKIDCandidateEvent));
1598 } 1598 }
1599 1599
1600 for (ii = 0; ii < 6; ii++) { 1600 for (ii = 0; ii < 6; ii++) {
1601 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02X ", *(pbyBSSID + ii)); 1601 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02X ", *(pbyBSSID + ii));
1602 } 1602 }
1603 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 1603 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
1604 1604
1605 1605
1606 // Update Old Candidate 1606 // Update Old Candidate
@@ -1625,7 +1625,7 @@ CARDbAdd_PMKID_Candidate (
1625 } 1625 }
1626 MEMvCopy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN); 1626 MEMvCopy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN);
1627 pDevice->gsPMKIDCandidate.NumCandidates++; 1627 pDevice->gsPMKIDCandidate.NumCandidates++;
1628 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); 1628 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
1629 return TRUE; 1629 return TRUE;
1630} 1630}
1631 1631
@@ -1709,7 +1709,7 @@ VOID CARDvInitChannelTable (PVOID pDeviceHandler)
1709 } 1709 }
1710 } 1710 }
1711 } 1711 }
1712 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO"Zone=[%d][%c][%c]!!\n",pDevice->byZoneType,ChannelRuleTab[pDevice->byZoneType].chCountryCode[0],ChannelRuleTab[pDevice->byZoneType].chCountryCode[1]); 1712 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO"Zone=[%d][%c][%c]!!\n",pDevice->byZoneType,ChannelRuleTab[pDevice->byZoneType].chCountryCode[0],ChannelRuleTab[pDevice->byZoneType].chCountryCode[1]);
1713 for(ii=0;ii<CARD_MAX_CHANNEL_TBL;ii++) { 1713 for(ii=0;ii<CARD_MAX_CHANNEL_TBL;ii++) {
1714 if (pDevice->abyRegPwr[ii+1] == 0) { 1714 if (pDevice->abyRegPwr[ii+1] == 0) {
1715 pDevice->abyRegPwr[ii+1] = pDevice->abyOFDMDefaultPwr[ii+1]; 1715 pDevice->abyRegPwr[ii+1] = pDevice->abyOFDMDefaultPwr[ii+1];
@@ -2599,22 +2599,22 @@ WORD CARDwGetOFDMControlRate (PVOID pDeviceHandler, WORD wRateIdx)
2599 PSDevice pDevice = (PSDevice) pDeviceHandler; 2599 PSDevice pDevice = (PSDevice) pDeviceHandler;
2600 UINT ui = (UINT)wRateIdx; 2600 UINT ui = (UINT)wRateIdx;
2601 2601
2602 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate); 2602 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate);
2603 2603
2604 if (!CARDbIsOFDMinBasicRate((PVOID)pDevice)) { 2604 if (!CARDbIsOFDMinBasicRate((PVOID)pDevice)) {
2605 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate:(NO OFDM) %d\n", wRateIdx); 2605 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate:(NO OFDM) %d\n", wRateIdx);
2606 if (wRateIdx > RATE_24M) 2606 if (wRateIdx > RATE_24M)
2607 wRateIdx = RATE_24M; 2607 wRateIdx = RATE_24M;
2608 return wRateIdx; 2608 return wRateIdx;
2609 } 2609 }
2610 while (ui > RATE_11M) { 2610 while (ui > RATE_11M) {
2611 if (pDevice->wBasicRate & ((WORD)1 << ui)) { 2611 if (pDevice->wBasicRate & ((WORD)1 << ui)) {
2612 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate : %d\n", ui); 2612 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate : %d\n", ui);
2613 return (WORD)ui; 2613 return (WORD)ui;
2614 } 2614 }
2615 ui --; 2615 ui --;
2616 } 2616 }
2617 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate: 6M\n"); 2617 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CARDwGetOFDMControlRate: 6M\n");
2618 return (WORD)RATE_24M; 2618 return (WORD)RATE_24M;
2619} 2619}
2620 2620
@@ -3085,7 +3085,7 @@ void CARDvSetFirstNextTBTT (DWORD_PTR dwIoBase, WORD wBeaconInterval)
3085 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwNextTBTT)); 3085 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwNextTBTT));
3086 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwNextTBTT)); 3086 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwNextTBTT));
3087 MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 3087 MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
3088 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:First Next TBTT[%8xh:%8xh] \n", HIDWORD(qwNextTBTT), LODWORD(qwNextTBTT)); 3088 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:First Next TBTT[%8xh:%8xh] \n", HIDWORD(qwNextTBTT), LODWORD(qwNextTBTT));
3089 return; 3089 return;
3090} 3090}
3091 3091
@@ -3113,7 +3113,7 @@ void CARDvUpdateNextTBTT (DWORD_PTR dwIoBase, QWORD qwTSF, WORD wBeaconInterval)
3113 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwTSF)); 3113 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT, LODWORD(qwTSF));
3114 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwTSF)); 3114 VNSvOutPortD(dwIoBase + MAC_REG_NEXTTBTT + 4, HIDWORD(qwTSF));
3115 MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); 3115 MACvRegBitsOn(dwIoBase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN);
3116 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:Update Next TBTT[%8xh:%8xh] \n",(UINT)HIDWORD(qwTSF), (UINT)LODWORD(qwTSF)); 3116 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Card:Update Next TBTT[%8xh:%8xh] \n",(UINT)HIDWORD(qwTSF), (UINT)LODWORD(qwTSF));
3117 3117
3118 return; 3118 return;
3119} 3119}
diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c
index f58f9636be2..92995a8f72c 100644
--- a/drivers/staging/vt6655/datarate.c
+++ b/drivers/staging/vt6655/datarate.c
@@ -239,7 +239,7 @@ UINT uRateLen;
239 *pwSuppRate = 0; 239 *pwSuppRate = 0;
240 uRateLen = pItemRates->len; 240 uRateLen = pItemRates->len;
241 241
242 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate Len: %d\n", uRateLen); 242 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate Len: %d\n", uRateLen);
243 if (pDevice->eCurrentPHYType != PHY_TYPE_11B) { 243 if (pDevice->eCurrentPHYType != PHY_TYPE_11B) {
244 if (uRateLen > WLAN_RATES_MAXLEN) 244 if (uRateLen > WLAN_RATES_MAXLEN)
245 uRateLen = WLAN_RATES_MAXLEN; 245 uRateLen = WLAN_RATES_MAXLEN;
@@ -254,7 +254,7 @@ UINT uRateLen;
254 (bUpdateBasicRate == TRUE)) { 254 (bUpdateBasicRate == TRUE)) {
255 // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate 255 // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
256 CARDbAddBasicRate((PVOID)pDevice, wGetRateIdx(byRate)); 256 CARDbAddBasicRate((PVOID)pDevice, wGetRateIdx(byRate));
257 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate)); 257 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
258 } 258 }
259 byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F); 259 byRate = (BYTE)(pItemRates->abyRates[ii]&0x7F);
260 if (byHighSuppRate == 0) 260 if (byHighSuppRate == 0)
@@ -277,7 +277,7 @@ UINT uRateLen;
277 if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) { 277 if (WLAN_MGMT_IS_BASICRATE(pItemExtRates->abyRates[ii])) {
278 // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate 278 // Add to basic rate set, update pDevice->byTopCCKBasicRate and pDevice->byTopOFDMBasicRate
279 CARDbAddBasicRate((PVOID)pDevice, wGetRateIdx(byRate)); 279 CARDbAddBasicRate((PVOID)pDevice, wGetRateIdx(byRate));
280 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate)); 280 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ParseMaxRate AddBasicRate: %d\n", wGetRateIdx(byRate));
281 } 281 }
282 byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F); 282 byRate = (BYTE)(pItemExtRates->abyRates[ii]&0x7F);
283 if (byHighSuppRate == 0) 283 if (byHighSuppRate == 0)
@@ -303,7 +303,7 @@ UINT uRateLen;
303 if (wOldBasicRate != pDevice->wBasicRate) 303 if (wOldBasicRate != pDevice->wBasicRate)
304 CARDvSetRSPINF((PVOID)pDevice, pDevice->eCurrentPHYType); 304 CARDvSetRSPINF((PVOID)pDevice, pDevice->eCurrentPHYType);
305 305
306 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n"); 306 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Exit ParseMaxRate\n");
307} 307}
308 308
309 309
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 38cc942deca..33d5a4452d9 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -200,9 +200,6 @@
200// BUILD OBJ mode 200// BUILD OBJ mode
201 201
202 202
203#define DEVICE_PRT(l, p, args...) {if (l<=msglevel) printk( p ,##args);}
204
205
206#define AVAIL_TD(p,q) ((p)->sOpts.nTxDescs[(q)]-((p)->iTDUsed[(q)])) 203#define AVAIL_TD(p,q) ((p)->sOpts.nTxDescs[(q)]-((p)->iTDUsed[(q)]))
207 204
208//PLICE_DEBUG -> 205//PLICE_DEBUG ->
@@ -211,9 +208,14 @@
211 208
212 209
213 210
211#define PRIVATE_Message 0
212
214/*--------------------- Export Types ------------------------------*/ 213/*--------------------- Export Types ------------------------------*/
215 214
216 215
216#define DBG_PRT(l, p, args...) {if (l<=msglevel) printk( p ,##args);}
217#define PRINT_K(p, args...) {if (PRIVATE_Message) printk( p ,##args);}
218
217//0:11A 1:11B 2:11G 219//0:11A 1:11B 2:11G
218typedef enum _VIA_BB_TYPE 220typedef enum _VIA_BB_TYPE
219{ 221{
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index fe9cc783dc7..c41c02689fe 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -421,11 +421,11 @@ device_set_int_opt(int *opt, int val, int min, int max, int def,char* name,char*
421 if (val==-1) 421 if (val==-1)
422 *opt=def; 422 *opt=def;
423 else if (val<min || val>max) { 423 else if (val<min || val>max) {
424 DEVICE_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: the value of parameter %s is invalid, the valid range is (%d-%d)\n" , 424 DBG_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: the value of parameter %s is invalid, the valid range is (%d-%d)\n" ,
425 devname,name, min,max); 425 devname,name, min,max);
426 *opt=def; 426 *opt=def;
427 } else { 427 } else {
428 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: set value of parameter %s to %d\n", 428 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: set value of parameter %s to %d\n",
429 devname, name, val); 429 devname, name, val);
430 *opt=val; 430 *opt=val;
431 } 431 }
@@ -437,11 +437,11 @@ device_set_bool_opt(PU32 opt, int val,BOOL def,U32 flag, char* name,char* devnam
437 if (val==-1) 437 if (val==-1)
438 *opt|=(def ? flag : 0); 438 *opt|=(def ? flag : 0);
439 else if (val<0 || val>1) { 439 else if (val<0 || val>1) {
440 DEVICE_PRT(MSG_LEVEL_INFO, KERN_NOTICE 440 DBG_PRT(MSG_LEVEL_INFO, KERN_NOTICE
441 "%s: the value of parameter %s is invalid, the valid range is (0-1)\n",devname,name); 441 "%s: the value of parameter %s is invalid, the valid range is (0-1)\n",devname,name);
442 *opt|=(def ? flag : 0); 442 *opt|=(def ? flag : 0);
443 } else { 443 } else {
444 DEVICE_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: set parameter %s to %s\n", 444 DBG_PRT(MSG_LEVEL_INFO, KERN_NOTICE "%s: set parameter %s to %s\n",
445 devname,name , val ? "TRUE" : "FALSE"); 445 devname,name , val ? "TRUE" : "FALSE");
446 *opt|=(val ? flag : 0); 446 *opt|=(val ? flag : 0);
447 } 447 }
@@ -512,18 +512,18 @@ pDevice->bUpdateBBVGA = TRUE;
512 pDevice->byPreambleType = 0; 512 pDevice->byPreambleType = 0;
513 513
514 514
515 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uChannel= %d\n",(INT)pDevice->uChannel); 515 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uChannel= %d\n",(INT)pDevice->uChannel);
516 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byOpMode= %d\n",(INT)pDevice->byOpMode); 516 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byOpMode= %d\n",(INT)pDevice->byOpMode);
517 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" ePSMode= %d\n",(INT)pDevice->ePSMode); 517 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" ePSMode= %d\n",(INT)pDevice->ePSMode);
518 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" wRTSThreshold= %d\n",(INT)pDevice->wRTSThreshold); 518 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" wRTSThreshold= %d\n",(INT)pDevice->wRTSThreshold);
519 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortRetryLimit= %d\n",(INT)pDevice->byShortRetryLimit); 519 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortRetryLimit= %d\n",(INT)pDevice->byShortRetryLimit);
520 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byLongRetryLimit= %d\n",(INT)pDevice->byLongRetryLimit); 520 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byLongRetryLimit= %d\n",(INT)pDevice->byLongRetryLimit);
521 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byPreambleType= %d\n",(INT)pDevice->byPreambleType); 521 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byPreambleType= %d\n",(INT)pDevice->byPreambleType);
522 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortPreamble= %d\n",(INT)pDevice->byShortPreamble); 522 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byShortPreamble= %d\n",(INT)pDevice->byShortPreamble);
523 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uConnectionRate= %d\n",(INT)pDevice->uConnectionRate); 523 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" uConnectionRate= %d\n",(INT)pDevice->uConnectionRate);
524 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byBBType= %d\n",(INT)pDevice->byBBType); 524 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" byBBType= %d\n",(INT)pDevice->byBBType);
525 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->b11hEnable= %d\n",(INT)pDevice->b11hEnable); 525 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->b11hEnable= %d\n",(INT)pDevice->b11hEnable);
526 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(INT)pDevice->bDiversityRegCtlON); 526 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(INT)pDevice->bDiversityRegCtlON);
527} 527}
528 528
529static VOID s_vCompleteCurrentMeasure (IN PSDevice pDevice, IN BYTE byResult) 529static VOID s_vCompleteCurrentMeasure (IN PSDevice pDevice, IN BYTE byResult)
@@ -679,7 +679,7 @@ byValue1 = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_ANTENNA);
679#ifdef PLICE_DEBUG 679#ifdef PLICE_DEBUG
680 //printk("init registers: TxAntennaMode is %d\n",pDevice->byTxAntennaMode); 680 //printk("init registers: TxAntennaMode is %d\n",pDevice->byTxAntennaMode);
681#endif 681#endif
682 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bDiversityEnable=[%d],NValue=[%d],MValue=[%d],TMax=[%d],TMax2=[%d]\n", 682 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bDiversityEnable=[%d],NValue=[%d],MValue=[%d],TMax=[%d],TMax2=[%d]\n",
683 pDevice->bDiversityEnable,(int)pDevice->ulDiversityNValue,(int)pDevice->ulDiversityMValue,pDevice->byTMax,pDevice->byTMax2); 683 pDevice->bDiversityEnable,(int)pDevice->ulDiversityNValue,(int)pDevice->ulDiversityMValue,pDevice->byTMax,pDevice->byTMax2);
684 684
685//#ifdef ZoneType_DefaultSetting 685//#ifdef ZoneType_DefaultSetting
@@ -691,7 +691,7 @@ byValue1 = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_ANTENNA);
691 (pDevice->abyEEPROM[EEP_OFS_ZONETYPE] !=0x00)){ //for USA 691 (pDevice->abyEEPROM[EEP_OFS_ZONETYPE] !=0x00)){ //for USA
692 pDevice->abyEEPROM[EEP_OFS_ZONETYPE] = 0; 692 pDevice->abyEEPROM[EEP_OFS_ZONETYPE] = 0;
693 pDevice->abyEEPROM[EEP_OFS_MAXCHANNEL] = 0x0B; 693 pDevice->abyEEPROM[EEP_OFS_MAXCHANNEL] = 0x0B;
694 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Init Zone Type :USA\n"); 694 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Init Zone Type :USA\n");
695 } 695 }
696 else if((zonetype == 1)&& 696 else if((zonetype == 1)&&
697 (pDevice->abyEEPROM[EEP_OFS_ZONETYPE]!=0x01)){ //for Japan 697 (pDevice->abyEEPROM[EEP_OFS_ZONETYPE]!=0x01)){ //for Japan
@@ -702,7 +702,7 @@ byValue1 = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_ANTENNA);
702 (pDevice->abyEEPROM[EEP_OFS_ZONETYPE]!=0x02)){ //for Europe 702 (pDevice->abyEEPROM[EEP_OFS_ZONETYPE]!=0x02)){ //for Europe
703 pDevice->abyEEPROM[EEP_OFS_ZONETYPE] = 0x02; 703 pDevice->abyEEPROM[EEP_OFS_ZONETYPE] = 0x02;
704 pDevice->abyEEPROM[EEP_OFS_MAXCHANNEL] = 0x0D; 704 pDevice->abyEEPROM[EEP_OFS_MAXCHANNEL] = 0x0D;
705 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Init Zone Type :Europe\n"); 705 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Init Zone Type :Europe\n");
706 } 706 }
707 707
708else 708else
@@ -725,12 +725,12 @@ else
725 } 725 }
726 726
727 pDevice->byRFType &= RF_MASK; 727 pDevice->byRFType &= RF_MASK;
728 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRFType = %x\n", pDevice->byRFType); 728 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRFType = %x\n", pDevice->byRFType);
729 729
730 if (pDevice->bZoneRegExist == FALSE) { 730 if (pDevice->bZoneRegExist == FALSE) {
731 pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; 731 pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];
732 } 732 }
733 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byZoneType = %x\n", pDevice->byZoneType); 733 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byZoneType = %x\n", pDevice->byZoneType);
734 734
735 //Init RF module 735 //Init RF module
736 RFbInit(pDevice); 736 RFbInit(pDevice);
@@ -860,7 +860,7 @@ else CARDbRadioPowerOn(pDevice);
860 pMgmt->eScanType = WMAC_SCAN_PASSIVE; 860 pMgmt->eScanType = WMAC_SCAN_PASSIVE;
861 // get Permanent network address 861 // get Permanent network address
862 SROMvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr); 862 SROMvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr);
863 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Network address = %02x-%02x-%02x=%02x-%02x-%02x\n", 863 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Network address = %02x-%02x-%02x=%02x-%02x-%02x\n",
864 pDevice->abyCurrentNetAddr[0], 864 pDevice->abyCurrentNetAddr[0],
865 pDevice->abyCurrentNetAddr[1], 865 pDevice->abyCurrentNetAddr[1],
866 pDevice->abyCurrentNetAddr[2], 866 pDevice->abyCurrentNetAddr[2],
@@ -1153,17 +1153,17 @@ static void device_print_info(PSDevice pDevice)
1153{ 1153{
1154 struct net_device* dev=pDevice->dev; 1154 struct net_device* dev=pDevice->dev;
1155 1155
1156 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: %s\n",dev->name, get_chip_name(pDevice->chip_id)); 1156 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: %s\n",dev->name, get_chip_name(pDevice->chip_id));
1157 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X", 1157 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
1158 dev->name, 1158 dev->name,
1159 dev->dev_addr[0],dev->dev_addr[1],dev->dev_addr[2], 1159 dev->dev_addr[0],dev->dev_addr[1],dev->dev_addr[2],
1160 dev->dev_addr[3],dev->dev_addr[4],dev->dev_addr[5]); 1160 dev->dev_addr[3],dev->dev_addr[4],dev->dev_addr[5]);
1161#ifdef IO_MAP 1161#ifdef IO_MAP
1162 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx ",(ULONG) pDevice->ioaddr); 1162 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx ",(ULONG) pDevice->ioaddr);
1163 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO" IRQ=%d \n", pDevice->dev->irq); 1163 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IRQ=%d \n", pDevice->dev->irq);
1164#else 1164#else
1165 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx Mem=0x%lx ",(ULONG) pDevice->ioaddr,(ULONG) pDevice->PortOffset); 1165 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IO=0x%lx Mem=0x%lx ",(ULONG) pDevice->ioaddr,(ULONG) pDevice->PortOffset);
1166 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO" IRQ=%d \n", pDevice->dev->irq); 1166 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO" IRQ=%d \n", pDevice->dev->irq);
1167#endif 1167#endif
1168 1168
1169} 1169}
@@ -1288,7 +1288,7 @@ device_release_WPADEV(pDevice);
1288 ptr->prev->next=ptr->next; 1288 ptr->prev->next=ptr->next;
1289 } 1289 }
1290 else { 1290 else {
1291 DEVICE_PRT(MSG_LEVEL_ERR, KERN_ERR "info struct not found\n"); 1291 DBG_PRT(MSG_LEVEL_ERR, KERN_ERR "info struct not found\n");
1292 return; 1292 return;
1293 } 1293 }
1294#ifdef HOSTAP 1294#ifdef HOSTAP
@@ -1324,7 +1324,7 @@ static BOOL device_init_rings(PSDevice pDevice) {
1324 &pDevice->pool_dma); 1324 &pDevice->pool_dma);
1325 1325
1326 if (vir_pool == NULL) { 1326 if (vir_pool == NULL) {
1327 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s : allocate desc dma memory failed\n", pDevice->dev->name); 1327 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s : allocate desc dma memory failed\n", pDevice->dev->name);
1328 return FALSE; 1328 return FALSE;
1329 } 1329 }
1330 1330
@@ -1352,7 +1352,7 @@ static BOOL device_init_rings(PSDevice pDevice) {
1352 &pDevice->tx_bufs_dma0); 1352 &pDevice->tx_bufs_dma0);
1353 1353
1354 if (pDevice->tx0_bufs == NULL) { 1354 if (pDevice->tx0_bufs == NULL) {
1355 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: allocate buf dma memory failed\n", pDevice->dev->name); 1355 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: allocate buf dma memory failed\n", pDevice->dev->name);
1356 pci_free_consistent(pDevice->pcid, 1356 pci_free_consistent(pDevice->pcid,
1357 pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc) + 1357 pDevice->sOpts.nRxDescs0 * sizeof(SRxDesc) +
1358 pDevice->sOpts.nRxDescs1 * sizeof(SRxDesc) + 1358 pDevice->sOpts.nRxDescs1 * sizeof(SRxDesc) +
@@ -1441,7 +1441,7 @@ static void device_init_rd0_ring(PSDevice pDevice) {
1441 pDesc->pRDInfo = alloc_rd_info(); 1441 pDesc->pRDInfo = alloc_rd_info();
1442 ASSERT(pDesc->pRDInfo); 1442 ASSERT(pDesc->pRDInfo);
1443 if (!device_alloc_rx_buf(pDevice, pDesc)) { 1443 if (!device_alloc_rx_buf(pDevice, pDesc)) {
1444 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc rx bufs\n", 1444 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc rx bufs\n",
1445 pDevice->dev->name); 1445 pDevice->dev->name);
1446 } 1446 }
1447 pDesc->next = &(pDevice->aRD0Ring[(i+1) % pDevice->sOpts.nRxDescs0]); 1447 pDesc->next = &(pDevice->aRD0Ring[(i+1) % pDevice->sOpts.nRxDescs0]);
@@ -1465,7 +1465,7 @@ static void device_init_rd1_ring(PSDevice pDevice) {
1465 pDesc->pRDInfo = alloc_rd_info(); 1465 pDesc->pRDInfo = alloc_rd_info();
1466 ASSERT(pDesc->pRDInfo); 1466 ASSERT(pDesc->pRDInfo);
1467 if (!device_alloc_rx_buf(pDevice, pDesc)) { 1467 if (!device_alloc_rx_buf(pDevice, pDesc)) {
1468 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc rx bufs\n", 1468 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc rx bufs\n",
1469 pDevice->dev->name); 1469 pDevice->dev->name);
1470 } 1470 }
1471 pDesc->next = &(pDevice->aRD1Ring[(i+1) % pDevice->sOpts.nRxDescs1]); 1471 pDesc->next = &(pDevice->aRD1Ring[(i+1) % pDevice->sOpts.nRxDescs1]);
@@ -1486,7 +1486,7 @@ static void device_init_defrag_cb(PSDevice pDevice) {
1486 for (i = 0; i < CB_MAX_RX_FRAG; i++) { 1486 for (i = 0; i < CB_MAX_RX_FRAG; i++) {
1487 pDeF = &(pDevice->sRxDFCB[i]); 1487 pDeF = &(pDevice->sRxDFCB[i]);
1488 if (!device_alloc_frag_buf(pDevice, pDeF)) { 1488 if (!device_alloc_frag_buf(pDevice, pDeF)) {
1489 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc frag bufs\n", 1489 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc frag bufs\n",
1490 pDevice->dev->name); 1490 pDevice->dev->name);
1491 }; 1491 };
1492 } 1492 }
@@ -1645,12 +1645,12 @@ static int device_rx_srv(PSDevice pDevice, UINT uIdx) {
1645 for (pRD = pDevice->pCurrRD[uIdx]; 1645 for (pRD = pDevice->pCurrRD[uIdx];
1646 pRD->m_rd0RD0.f1Owner == OWNED_BY_HOST; 1646 pRD->m_rd0RD0.f1Owner == OWNED_BY_HOST;
1647 pRD = pRD->next) { 1647 pRD = pRD->next) {
1648// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->pCurrRD = %x, works = %d\n", pRD, works); 1648// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->pCurrRD = %x, works = %d\n", pRD, works);
1649 if (works++>15) 1649 if (works++>15)
1650 break; 1650 break;
1651 if (device_receive_frame(pDevice, pRD)) { 1651 if (device_receive_frame(pDevice, pRD)) {
1652 if (!device_alloc_rx_buf(pDevice,pRD)) { 1652 if (!device_alloc_rx_buf(pDevice,pRD)) {
1653 DEVICE_PRT(MSG_LEVEL_ERR, KERN_ERR 1653 DBG_PRT(MSG_LEVEL_ERR, KERN_ERR
1654 "%s: can not allocate rx buf\n", pDevice->dev->name); 1654 "%s: can not allocate rx buf\n", pDevice->dev->name);
1655 break; 1655 break;
1656 } 1656 }
@@ -1753,7 +1753,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
1753 1753
1754 if (BITbIsBitOff(byTsr1, TSR1_TERR)) { 1754 if (BITbIsBitOff(byTsr1, TSR1_TERR)) {
1755 if (byTsr0 != 0) { 1755 if (byTsr0 != 0) {
1756 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X].\n", 1756 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] OK but has error. tsr1[%02X] tsr0[%02X].\n",
1757 (INT)uIdx, byTsr1, byTsr0); 1757 (INT)uIdx, byTsr1, byTsr0);
1758 } 1758 }
1759 if ((pTxBufHead->wFragCtl & FRAGCTL_ENDFRAG) != FRAGCTL_NONFRAG) { 1759 if ((pTxBufHead->wFragCtl & FRAGCTL_ENDFRAG) != FRAGCTL_NONFRAG) {
@@ -1763,7 +1763,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
1763 pStats->tx_bytes += pTD->pTDInfo->skb->len; 1763 pStats->tx_bytes += pTD->pTDInfo->skb->len;
1764 } 1764 }
1765 else { 1765 else {
1766 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] dropped & tsr1[%02X] tsr0[%02X].\n", 1766 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] dropped & tsr1[%02X] tsr0[%02X].\n",
1767 (INT)uIdx, byTsr1, byTsr0); 1767 (INT)uIdx, byTsr1, byTsr0);
1768 pStats->tx_errors++; 1768 pStats->tx_errors++;
1769 pStats->tx_dropped++; 1769 pStats->tx_dropped++;
@@ -1772,7 +1772,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
1772 1772
1773 if ((pTD->pTDInfo->byFlags & TD_FLAGS_PRIV_SKB) != 0) { 1773 if ((pTD->pTDInfo->byFlags & TD_FLAGS_PRIV_SKB) != 0) {
1774 if (pDevice->bEnableHostapd) { 1774 if (pDevice->bEnableHostapd) {
1775 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "tx call back netif.. \n"); 1775 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "tx call back netif.. \n");
1776 skb = pTD->pTDInfo->skb; 1776 skb = pTD->pTDInfo->skb;
1777 skb->dev = pDevice->apdev; 1777 skb->dev = pDevice->apdev;
1778 skb_reset_mac_header(skb); 1778 skb_reset_mac_header(skb);
@@ -1785,11 +1785,11 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
1785 1785
1786 if (BITbIsBitOn(byTsr1, TSR1_TERR)) { 1786 if (BITbIsBitOn(byTsr1, TSR1_TERR)) {
1787 if ((pTD->pTDInfo->byFlags & TD_FLAGS_PRIV_SKB) != 0) { 1787 if ((pTD->pTDInfo->byFlags & TD_FLAGS_PRIV_SKB) != 0) {
1788 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n", 1788 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n",
1789 (INT)uIdx, byTsr1, byTsr0); 1789 (INT)uIdx, byTsr1, byTsr0);
1790 } 1790 }
1791 1791
1792// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n", 1792// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Tx[%d] fail has error. tsr1[%02X] tsr0[%02X].\n",
1793// (INT)uIdx, byTsr1, byTsr0); 1793// (INT)uIdx, byTsr1, byTsr0);
1794 1794
1795 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) && 1795 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_AP) &&
@@ -1806,7 +1806,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
1806 wAID = pMgmt->sNodeDBTable[uNodeIndex].wAID; 1806 wAID = pMgmt->sNodeDBTable[uNodeIndex].wAID;
1807 pMgmt->abyPSTxMap[wAID >> 3] |= byMask[wAID & 7]; 1807 pMgmt->abyPSTxMap[wAID >> 3] |= byMask[wAID & 7];
1808 pTD->pTDInfo->byFlags &= ~(TD_FLAGS_NETIF_SKB); 1808 pTD->pTDInfo->byFlags &= ~(TD_FLAGS_NETIF_SKB);
1809 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "tx_srv:tx fail re-queue sta index= %d, QueCnt= %d\n" 1809 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "tx_srv:tx fail re-queue sta index= %d, QueCnt= %d\n"
1810 ,(INT)uNodeIndex, pMgmt->sNodeDBTable[uNodeIndex].wEnQueueCnt); 1810 ,(INT)uNodeIndex, pMgmt->sNodeDBTable[uNodeIndex].wEnQueueCnt);
1811 pStats->tx_errors--; 1811 pStats->tx_errors--;
1812 pStats->tx_dropped--; 1812 pStats->tx_dropped--;
@@ -1825,7 +1825,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
1825 1825
1826 if (AVAIL_TD(pDevice, uIdx) < RESERV_AC0DMA) { 1826 if (AVAIL_TD(pDevice, uIdx) < RESERV_AC0DMA) {
1827 bFull = TRUE; 1827 bFull = TRUE;
1828 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " AC0DMA is Full = %d\n", pDevice->iTDUsed[uIdx]); 1828 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " AC0DMA is Full = %d\n", pDevice->iTDUsed[uIdx]);
1829 } 1829 }
1830 if (netif_queue_stopped(pDevice->dev) && (bFull==FALSE)){ 1830 if (netif_queue_stopped(pDevice->dev) && (bFull==FALSE)){
1831 netif_wake_queue(pDevice->dev); 1831 netif_wake_queue(pDevice->dev);
@@ -1842,7 +1842,7 @@ static int device_tx_srv(PSDevice pDevice, UINT uIdx) {
1842static void device_error(PSDevice pDevice, WORD status) { 1842static void device_error(PSDevice pDevice, WORD status) {
1843 1843
1844 if (status & ISR_FETALERR) { 1844 if (status & ISR_FETALERR) {
1845 DEVICE_PRT(MSG_LEVEL_ERR, KERN_ERR 1845 DBG_PRT(MSG_LEVEL_ERR, KERN_ERR
1846 "%s: Hardware fatal error.\n", 1846 "%s: Hardware fatal error.\n",
1847 pDevice->dev->name); 1847 pDevice->dev->name);
1848 netif_stop_queue(pDevice->dev); 1848 netif_stop_queue(pDevice->dev);
@@ -1961,7 +1961,7 @@ static int device_open(struct net_device *dev) {
1961 wpa_Result.authenticated = FALSE; 1961 wpa_Result.authenticated = FALSE;
1962 pDevice->fWPA_Authened = FALSE; 1962 pDevice->fWPA_Authened = FALSE;
1963#endif 1963#endif
1964DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device init rd0 ring\n"); 1964DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device init rd0 ring\n");
1965device_init_rd0_ring(pDevice); 1965device_init_rd0_ring(pDevice);
1966 device_init_rd1_ring(pDevice); 1966 device_init_rd1_ring(pDevice);
1967 device_init_defrag_cb(pDevice); 1967 device_init_defrag_cb(pDevice);
@@ -2012,7 +2012,7 @@ device_init_rd0_ring(pDevice);
2012 2012
2013 // if (( SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_RADIOCTL)&0x06)==0x04) 2013 // if (( SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_RADIOCTL)&0x06)==0x04)
2014 // return -ENOMEM; 2014 // return -ENOMEM;
2015DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device_init_registers\n"); 2015DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device_init_registers\n");
2016 device_init_registers(pDevice, DEVICE_INIT_COLD); 2016 device_init_registers(pDevice, DEVICE_INIT_COLD);
2017 MACvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr); 2017 MACvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr);
2018 memcpy(pDevice->pMgmt->abyMACAddr, pDevice->abyCurrentNetAddr, U_ETHER_ADDR_LEN); 2018 memcpy(pDevice->pMgmt->abyMACAddr, pDevice->abyCurrentNetAddr, U_ETHER_ADDR_LEN);
@@ -2051,7 +2051,7 @@ DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call device_init_registers\n");
2051//printk("DEBUG2\n"); 2051//printk("DEBUG2\n");
2052 2052
2053 2053
2054DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n"); 2054DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n");
2055 MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); 2055 MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
2056 2056
2057 if (pDevice->pMgmt->eConfigMode == WMAC_CONFIG_AP) { 2057 if (pDevice->pMgmt->eConfigMode == WMAC_CONFIG_AP) {
@@ -2063,7 +2063,7 @@ DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n");
2063 } 2063 }
2064 pDevice->flags |=DEVICE_FLAGS_OPENED; 2064 pDevice->flags |=DEVICE_FLAGS_OPENED;
2065 2065
2066 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n"); 2066 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n");
2067 return 0; 2067 return 0;
2068} 2068}
2069 2069
@@ -2118,7 +2118,7 @@ device_release_WPADEV(pDevice);
2118//PLICE_DEBUG-> 2118//PLICE_DEBUG->
2119 //tasklet_kill(&pDevice->RxMngWorkItem); 2119 //tasklet_kill(&pDevice->RxMngWorkItem);
2120//PLICE_DEBUG<- 2120//PLICE_DEBUG<-
2121 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_close.. \n"); 2121 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_close.. \n");
2122 return 0; 2122 return 0;
2123} 2123}
2124 2124
@@ -2130,11 +2130,11 @@ static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) {
2130 UINT cbMPDULen = 0; 2130 UINT cbMPDULen = 0;
2131 2131
2132 2132
2133 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211\n"); 2133 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211\n");
2134 spin_lock_irq(&pDevice->lock); 2134 spin_lock_irq(&pDevice->lock);
2135 2135
2136 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 0) { 2136 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 0) {
2137 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211, td0 <=0\n"); 2137 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211, td0 <=0\n");
2138 dev_kfree_skb_irq(skb); 2138 dev_kfree_skb_irq(skb);
2139 spin_unlock_irq(&pDevice->lock); 2139 spin_unlock_irq(&pDevice->lock);
2140 return 0; 2140 return 0;
@@ -2164,7 +2164,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex) {
2164 PSTxDesc pHeadTD, pLastTD; 2164 PSTxDesc pHeadTD, pLastTD;
2165 UINT cbFrameBodySize; 2165 UINT cbFrameBodySize;
2166 UINT uMACfragNum; 2166 UINT uMACfragNum;
2167 BYTE byPktTyp; 2167 BYTE byPktType;
2168 BOOL bNeedEncryption = FALSE; 2168 BOOL bNeedEncryption = FALSE;
2169 PSKeyItem pTransmitKey = NULL; 2169 PSKeyItem pTransmitKey = NULL;
2170 UINT cbHeaderSize; 2170 UINT cbHeaderSize;
@@ -2180,14 +2180,14 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex) {
2180 2180
2181 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 0) { 2181 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 0) {
2182 dev_kfree_skb_irq(skb); 2182 dev_kfree_skb_irq(skb);
2183 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_xmit, td0 <=0\n"); 2183 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_xmit, td0 <=0\n");
2184 return FALSE; 2184 return FALSE;
2185 } 2185 }
2186 2186
2187 if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { 2187 if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
2188 if (pDevice->uAssocCount == 0) { 2188 if (pDevice->uAssocCount == 0) {
2189 dev_kfree_skb_irq(skb); 2189 dev_kfree_skb_irq(skb);
2190 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_xmit, assocCount = 0\n"); 2190 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_xmit, assocCount = 0\n");
2191 return FALSE; 2191 return FALSE;
2192 } 2192 }
2193 } 2193 }
@@ -2209,7 +2209,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex) {
2209 dev_kfree_skb_irq(skb); 2209 dev_kfree_skb_irq(skb);
2210 return FALSE; 2210 return FALSE;
2211 } 2211 }
2212 byPktTyp = (BYTE)pDevice->byPacketType; 2212 byPktType = (BYTE)pDevice->byPacketType;
2213 2213
2214 2214
2215 if (pDevice->bFixRate) { 2215 if (pDevice->bFixRate) {
@@ -2238,18 +2238,18 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex) {
2238 pDevice->byPreambleType = PREAMBLE_LONG; 2238 pDevice->byPreambleType = PREAMBLE_LONG;
2239 } 2239 }
2240 2240
2241 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dma0: pDevice->wCurrentRate = %d \n", pDevice->wCurrentRate); 2241 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dma0: pDevice->wCurrentRate = %d \n", pDevice->wCurrentRate);
2242 2242
2243 2243
2244 if (pDevice->wCurrentRate <= RATE_11M) { 2244 if (pDevice->wCurrentRate <= RATE_11M) {
2245 byPktTyp = PK_TYPE_11B; 2245 byPktType = PK_TYPE_11B;
2246 } else if (pDevice->eCurrentPHYType == PHY_TYPE_11A) { 2246 } else if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
2247 byPktTyp = PK_TYPE_11A; 2247 byPktType = PK_TYPE_11A;
2248 } else { 2248 } else {
2249 if (pDevice->bProtectMode == TRUE) { 2249 if (pDevice->bProtectMode == TRUE) {
2250 byPktTyp = PK_TYPE_11GB; 2250 byPktType = PK_TYPE_11GB;
2251 } else { 2251 } else {
2252 byPktTyp = PK_TYPE_11GA; 2252 byPktType = PK_TYPE_11GA;
2253 } 2253 }
2254 } 2254 }
2255 2255
@@ -2268,7 +2268,7 @@ BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex) {
2268 pTransmitKey->uKeyLength 2268 pTransmitKey->uKeyLength
2269 ); 2269 );
2270 } 2270 }
2271 vGenerateFIFOHeader(pDevice, byPktTyp, pDevice->pbyTmpBuff, bNeedEncryption, 2271 vGenerateFIFOHeader(pDevice, byPktType, pDevice->pbyTmpBuff, bNeedEncryption,
2272 cbFrameBodySize, TYPE_TXDMA0, pHeadTD, 2272 cbFrameBodySize, TYPE_TXDMA0, pHeadTD,
2273 &pDevice->sTxEthHeader, (PBYTE)skb->data, pTransmitKey, uNodeIndex, 2273 &pDevice->sTxEthHeader, (PBYTE)skb->data, pTransmitKey, uNodeIndex,
2274 &uMACfragNum, 2274 &uMACfragNum,
@@ -2318,7 +2318,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
2318 WORD wAID; 2318 WORD wAID;
2319 UINT uMACfragNum = 1; 2319 UINT uMACfragNum = 1;
2320 UINT cbFrameBodySize; 2320 UINT cbFrameBodySize;
2321 BYTE byPktTyp; 2321 BYTE byPktType;
2322 UINT cbHeaderSize; 2322 UINT cbHeaderSize;
2323 BOOL bNeedEncryption = FALSE; 2323 BOOL bNeedEncryption = FALSE;
2324 PSKeyItem pTransmitKey = NULL; 2324 PSKeyItem pTransmitKey = NULL;
@@ -2370,7 +2370,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
2370 // set tx map 2370 // set tx map
2371 wAID = pMgmt->sNodeDBTable[uNodeIndex].wAID; 2371 wAID = pMgmt->sNodeDBTable[uNodeIndex].wAID;
2372 pMgmt->abyPSTxMap[wAID >> 3] |= byMask[wAID & 7]; 2372 pMgmt->abyPSTxMap[wAID >> 3] |= byMask[wAID & 7];
2373 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set:pMgmt->abyPSTxMap[%d]= %d\n", 2373 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set:pMgmt->abyPSTxMap[%d]= %d\n",
2374 (wAID >> 3), pMgmt->abyPSTxMap[wAID >> 3]); 2374 (wAID >> 3), pMgmt->abyPSTxMap[wAID >> 3]);
2375 spin_unlock_irq(&pDevice->lock); 2375 spin_unlock_irq(&pDevice->lock);
2376 return 0; 2376 return 0;
@@ -2388,7 +2388,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
2388 } 2388 }
2389 2389
2390 if (bNodeExist == FALSE) { 2390 if (bNodeExist == FALSE) {
2391 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Unknown STA not found in node DB \n"); 2391 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Unknown STA not found in node DB \n");
2392 dev_kfree_skb_irq(skb); 2392 dev_kfree_skb_irq(skb);
2393 spin_unlock_irq(&pDevice->lock); 2393 spin_unlock_irq(&pDevice->lock);
2394 return 0; 2394 return 0;
@@ -2420,20 +2420,20 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
2420 // get group key 2420 // get group key
2421 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == TRUE) { 2421 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == TRUE) {
2422 bTKIP_UseGTK = TRUE; 2422 bTKIP_UseGTK = TRUE;
2423 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n"); 2423 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n");
2424 break; 2424 break;
2425 } 2425 }
2426 } else { 2426 } else {
2427 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get PTK.\n"); 2427 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get PTK.\n");
2428 break; 2428 break;
2429 } 2429 }
2430 }else if (pDevice->pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { 2430 }else if (pDevice->pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
2431 2431
2432 pbyBSSID = pDevice->sTxEthHeader.abyDstAddr; //TO_DS = 0 and FROM_DS = 0 --> 802.11 MAC Address1 2432 pbyBSSID = pDevice->sTxEthHeader.abyDstAddr; //TO_DS = 0 and FROM_DS = 0 --> 802.11 MAC Address1
2433 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"IBSS Serach Key: \n"); 2433 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"IBSS Serach Key: \n");
2434 for (ii = 0; ii< 6; ii++) 2434 for (ii = 0; ii< 6; ii++)
2435 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"%x \n", *(pbyBSSID+ii)); 2435 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"%x \n", *(pbyBSSID+ii));
2436 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"\n"); 2436 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"\n");
2437 2437
2438 // get pairwise key 2438 // get pairwise key
2439 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == TRUE) 2439 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == TRUE)
@@ -2444,19 +2444,19 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
2444 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) { 2444 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) {
2445 pTransmitKey = NULL; 2445 pTransmitKey = NULL;
2446 if (pDevice->pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { 2446 if (pDevice->pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
2447 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"IBSS and KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode); 2447 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"IBSS and KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode);
2448 } 2448 }
2449 else 2449 else
2450 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"NOT IBSS and KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode); 2450 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"NOT IBSS and KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode);
2451 } else { 2451 } else {
2452 bTKIP_UseGTK = TRUE; 2452 bTKIP_UseGTK = TRUE;
2453 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n"); 2453 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n");
2454 } 2454 }
2455 } while(FALSE); 2455 } while(FALSE);
2456 } 2456 }
2457 2457
2458 if (pDevice->bEnableHostWEP) { 2458 if (pDevice->bEnableHostWEP) {
2459 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"acdma0: STA index %d\n", uNodeIndex); 2459 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"acdma0: STA index %d\n", uNodeIndex);
2460 if (pDevice->bEncryptionEnable == TRUE) { 2460 if (pDevice->bEncryptionEnable == TRUE) {
2461 pTransmitKey = &STempKey; 2461 pTransmitKey = &STempKey;
2462 pTransmitKey->byCipherSuite = pMgmt->sNodeDBTable[uNodeIndex].byCipherSuite; 2462 pTransmitKey->byCipherSuite = pMgmt->sNodeDBTable[uNodeIndex].byCipherSuite;
@@ -2474,7 +2474,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
2474 uMACfragNum = cbGetFragCount(pDevice, pTransmitKey, cbFrameBodySize, &pDevice->sTxEthHeader); 2474 uMACfragNum = cbGetFragCount(pDevice, pTransmitKey, cbFrameBodySize, &pDevice->sTxEthHeader);
2475 2475
2476 if (uMACfragNum > AVAIL_TD(pDevice, TYPE_AC0DMA)) { 2476 if (uMACfragNum > AVAIL_TD(pDevice, TYPE_AC0DMA)) {
2477 DEVICE_PRT(MSG_LEVEL_ERR, KERN_DEBUG "uMACfragNum > AVAIL_TD(TYPE_AC0DMA) = %d\n", uMACfragNum); 2477 DBG_PRT(MSG_LEVEL_ERR, KERN_DEBUG "uMACfragNum > AVAIL_TD(TYPE_AC0DMA) = %d\n", uMACfragNum);
2478 dev_kfree_skb_irq(skb); 2478 dev_kfree_skb_irq(skb);
2479 spin_unlock_irq(&pDevice->lock); 2479 spin_unlock_irq(&pDevice->lock);
2480 return 0; 2480 return 0;
@@ -2487,7 +2487,7 @@ static int device_xmit(struct sk_buff *skb, struct net_device *dev) {
2487 } 2487 }
2488 } 2488 }
2489 2489
2490 byPktTyp = (BYTE)pDevice->byPacketType; 2490 byPktType = (BYTE)pDevice->byPacketType;
2491 2491
2492 if (pDevice->bFixRate) { 2492 if (pDevice->bFixRate) {
2493#ifdef PLICE_DEBUG 2493#ifdef PLICE_DEBUG
@@ -2558,17 +2558,17 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate);
2558 } 2558 }
2559 } 2559 }
2560 2560
2561// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "acdma0: pDevice->wCurrentRate = %d \n", pDevice->wCurrentRate); 2561// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "acdma0: pDevice->wCurrentRate = %d \n", pDevice->wCurrentRate);
2562 2562
2563 if (pDevice->wCurrentRate <= RATE_11M) { 2563 if (pDevice->wCurrentRate <= RATE_11M) {
2564 byPktTyp = PK_TYPE_11B; 2564 byPktType = PK_TYPE_11B;
2565 } else if (pDevice->eCurrentPHYType == PHY_TYPE_11A) { 2565 } else if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
2566 byPktTyp = PK_TYPE_11A; 2566 byPktType = PK_TYPE_11A;
2567 } else { 2567 } else {
2568 if (pDevice->bProtectMode == TRUE) { 2568 if (pDevice->bProtectMode == TRUE) {
2569 byPktTyp = PK_TYPE_11GB; 2569 byPktType = PK_TYPE_11GB;
2570 } else { 2570 } else {
2571 byPktTyp = PK_TYPE_11GA; 2571 byPktType = PK_TYPE_11GA;
2572 } 2572 }
2573 } 2573 }
2574 2574
@@ -2577,20 +2577,20 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate);
2577//#endif 2577//#endif
2578 2578
2579 if (bNeedEncryption == TRUE) { 2579 if (bNeedEncryption == TRUE) {
2580 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ntohs Pkt Type=%04x\n", ntohs(pDevice->sTxEthHeader.wType)); 2580 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ntohs Pkt Type=%04x\n", ntohs(pDevice->sTxEthHeader.wType));
2581 if ((pDevice->sTxEthHeader.wType) == TYPE_PKT_802_1x) { 2581 if ((pDevice->sTxEthHeader.wType) == TYPE_PKT_802_1x) {
2582 bNeedEncryption = FALSE; 2582 bNeedEncryption = FALSE;
2583 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Pkt Type=%04x\n", (pDevice->sTxEthHeader.wType)); 2583 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Pkt Type=%04x\n", (pDevice->sTxEthHeader.wType));
2584 if ((pDevice->pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pDevice->pMgmt->eCurrState == WMAC_STATE_ASSOC)) { 2584 if ((pDevice->pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pDevice->pMgmt->eCurrState == WMAC_STATE_ASSOC)) {
2585 if (pTransmitKey == NULL) { 2585 if (pTransmitKey == NULL) {
2586 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Don't Find TX KEY\n"); 2586 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Don't Find TX KEY\n");
2587 } 2587 }
2588 else { 2588 else {
2589 if (bTKIP_UseGTK == TRUE) { 2589 if (bTKIP_UseGTK == TRUE) {
2590 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"error: KEY is GTK!!~~\n"); 2590 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"error: KEY is GTK!!~~\n");
2591 } 2591 }
2592 else { 2592 else {
2593 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex); 2593 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
2594 bNeedEncryption = TRUE; 2594 bNeedEncryption = TRUE;
2595 } 2595 }
2596 } 2596 }
@@ -2604,14 +2604,14 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate);
2604 if (pDevice->bEnableHostWEP) { 2604 if (pDevice->bEnableHostWEP) {
2605 if ((uNodeIndex != 0) && 2605 if ((uNodeIndex != 0) &&
2606 (pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex & PAIRWISE_KEY)) { 2606 (pMgmt->sNodeDBTable[uNodeIndex].dwKeyIndex & PAIRWISE_KEY)) {
2607 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex); 2607 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Find PTK [%lX]\n", pTransmitKey->dwKeyIndex);
2608 bNeedEncryption = TRUE; 2608 bNeedEncryption = TRUE;
2609 } 2609 }
2610 } 2610 }
2611 } 2611 }
2612 else { 2612 else {
2613 if (pTransmitKey == NULL) { 2613 if (pTransmitKey == NULL) {
2614 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"return no tx key\n"); 2614 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"return no tx key\n");
2615 dev_kfree_skb_irq(skb); 2615 dev_kfree_skb_irq(skb);
2616 spin_unlock_irq(&pDevice->lock); 2616 spin_unlock_irq(&pDevice->lock);
2617 return 0; 2617 return 0;
@@ -2626,7 +2626,7 @@ pDevice->byTopCCKBasicRate,pDevice->byTopOFDMBasicRate);
2626 // printk("ping:len is %d\n"); 2626 // printk("ping:len is %d\n");
2627 //} 2627 //}
2628#endif 2628#endif
2629 vGenerateFIFOHeader(pDevice, byPktTyp, pDevice->pbyTmpBuff, bNeedEncryption, 2629 vGenerateFIFOHeader(pDevice, byPktType, pDevice->pbyTmpBuff, bNeedEncryption,
2630 cbFrameBodySize, TYPE_AC0DMA, pHeadTD, 2630 cbFrameBodySize, TYPE_AC0DMA, pHeadTD,
2631 &pDevice->sTxEthHeader, (PBYTE)skb->data, pTransmitKey, uNodeIndex, 2631 &pDevice->sTxEthHeader, (PBYTE)skb->data, pTransmitKey, uNodeIndex,
2632 &uMACfragNum, 2632 &uMACfragNum,
@@ -2704,7 +2704,7 @@ BOOL bTxeapol_key = FALSE;
2704} 2704}
2705 2705
2706 MACvTransmitAC0(pDevice->PortOffset); 2706 MACvTransmitAC0(pDevice->PortOffset);
2707// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "acdma0:pDevice->apCurrTD= %p\n", pHeadTD); 2707// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "acdma0:pDevice->apCurrTD= %p\n", pHeadTD);
2708 2708
2709 dev->trans_start = jiffies; 2709 dev->trans_start = jiffies;
2710 2710
@@ -2733,7 +2733,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
2733 return IRQ_RETVAL(handled); 2733 return IRQ_RETVAL(handled);
2734 2734
2735 if (pDevice->dwIsr == 0xffffffff) { 2735 if (pDevice->dwIsr == 0xffffffff) {
2736 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dwIsr = 0xffff\n"); 2736 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dwIsr = 0xffff\n");
2737 return IRQ_RETVAL(handled); 2737 return IRQ_RETVAL(handled);
2738 } 2738 }
2739 /* 2739 /*
@@ -2772,7 +2772,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
2772 MACvWriteISR(pDevice->PortOffset, pDevice->dwIsr); 2772 MACvWriteISR(pDevice->PortOffset, pDevice->dwIsr);
2773 2773
2774 if (pDevice->dwIsr & ISR_FETALERR){ 2774 if (pDevice->dwIsr & ISR_FETALERR){
2775 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " ISR_FETALERR \n"); 2775 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " ISR_FETALERR \n");
2776 VNSvOutPortB(pDevice->PortOffset + MAC_REG_SOFTPWRCTL, 0); 2776 VNSvOutPortB(pDevice->PortOffset + MAC_REG_SOFTPWRCTL, 0);
2777 VNSvOutPortW(pDevice->PortOffset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); 2777 VNSvOutPortW(pDevice->PortOffset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI);
2778 device_error(pDevice, pDevice->dwIsr); 2778 device_error(pDevice, pDevice->dwIsr);
@@ -2888,11 +2888,11 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
2888 if (pDevice->uBBVGADiffCount == 1) { 2888 if (pDevice->uBBVGADiffCount == 1) {
2889 // first VGA diff gain 2889 // first VGA diff gain
2890 BBvSetVGAGainOffset(pDevice, pDevice->byBBVGANew); 2890 BBvSetVGAGainOffset(pDevice, pDevice->byBBVGANew);
2891 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"First RSSI[%d] NewGain[%d] OldGain[%d] Count[%d]\n", 2891 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"First RSSI[%d] NewGain[%d] OldGain[%d] Count[%d]\n",
2892 (int)ldBm, pDevice->byBBVGANew, pDevice->byBBVGACurrent, (int)pDevice->uBBVGADiffCount); 2892 (int)ldBm, pDevice->byBBVGANew, pDevice->byBBVGACurrent, (int)pDevice->uBBVGADiffCount);
2893 } 2893 }
2894 if (pDevice->uBBVGADiffCount >= BB_VGA_CHANGE_THRESHOLD) { 2894 if (pDevice->uBBVGADiffCount >= BB_VGA_CHANGE_THRESHOLD) {
2895 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RSSI[%d] NewGain[%d] OldGain[%d] Count[%d]\n", 2895 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RSSI[%d] NewGain[%d] OldGain[%d] Count[%d]\n",
2896 (int)ldBm, pDevice->byBBVGANew, pDevice->byBBVGACurrent, (int)pDevice->uBBVGADiffCount); 2896 (int)ldBm, pDevice->byBBVGANew, pDevice->byBBVGACurrent, (int)pDevice->uBBVGADiffCount);
2897 BBvSetVGAGainOffset(pDevice, pDevice->byBBVGANew); 2897 BBvSetVGAGainOffset(pDevice, pDevice->byBBVGANew);
2898 } 2898 }
@@ -3134,7 +3134,7 @@ static void device_set_multi(struct net_device *dev) {
3134 VNSvInPortB(pDevice->PortOffset + MAC_REG_RCR, &(pDevice->byRxMode)); 3134 VNSvInPortB(pDevice->PortOffset + MAC_REG_RCR, &(pDevice->byRxMode));
3135 3135
3136 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 3136 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
3137 DEVICE_PRT(MSG_LEVEL_ERR,KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name); 3137 DBG_PRT(MSG_LEVEL_ERR,KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
3138 /* Unconditionally log net taps. */ 3138 /* Unconditionally log net taps. */
3139 pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST|RCR_UNICAST); 3139 pDevice->byRxMode |= (RCR_MULTICAST|RCR_BROADCAST|RCR_UNICAST);
3140 } 3140 }
@@ -3168,7 +3168,7 @@ static void device_set_multi(struct net_device *dev) {
3168 } 3168 }
3169 3169
3170 VNSvOutPortB(pDevice->PortOffset + MAC_REG_RCR, pDevice->byRxMode); 3170 VNSvOutPortB(pDevice->PortOffset + MAC_REG_RCR, pDevice->byRxMode);
3171 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRxMode = %x\n", pDevice->byRxMode ); 3171 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->byRxMode = %x\n", pDevice->byRxMode );
3172} 3172}
3173 3173
3174 3174
@@ -3267,13 +3267,13 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3267 3267
3268 // Set desired station name 3268 // Set desired station name
3269 case SIOCSIWNICKN: 3269 case SIOCSIWNICKN:
3270 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWNICKN \n"); 3270 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWNICKN \n");
3271 rc = -EOPNOTSUPP; 3271 rc = -EOPNOTSUPP;
3272 break; 3272 break;
3273 3273
3274 // Get current station name 3274 // Get current station name
3275 case SIOCGIWNICKN: 3275 case SIOCGIWNICKN:
3276 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWNICKN \n"); 3276 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWNICKN \n");
3277 rc = -EOPNOTSUPP; 3277 rc = -EOPNOTSUPP;
3278 break; 3278 break;
3279 3279
@@ -3372,12 +3372,12 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3372 3372
3373 // Get the current Tx-Power 3373 // Get the current Tx-Power
3374 case SIOCGIWTXPOW: 3374 case SIOCGIWTXPOW:
3375 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n"); 3375 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n");
3376 rc = -EOPNOTSUPP; 3376 rc = -EOPNOTSUPP;
3377 break; 3377 break;
3378 3378
3379 case SIOCSIWTXPOW: 3379 case SIOCSIWTXPOW:
3380 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n"); 3380 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWTXPOW \n");
3381 rc = -EOPNOTSUPP; 3381 rc = -EOPNOTSUPP;
3382 break; 3382 break;
3383 3383
@@ -3422,7 +3422,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3422 break; 3422 break;
3423 3423
3424 case SIOCSIWSENS: 3424 case SIOCSIWSENS:
3425 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSENS \n"); 3425 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSENS \n");
3426 rc = -EOPNOTSUPP; 3426 rc = -EOPNOTSUPP;
3427 break; 3427 break;
3428 3428
@@ -3448,21 +3448,21 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3448 // Set the spy list 3448 // Set the spy list
3449 case SIOCSIWSPY: 3449 case SIOCSIWSPY:
3450 3450
3451 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSPY \n"); 3451 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSPY \n");
3452 rc = -EOPNOTSUPP; 3452 rc = -EOPNOTSUPP;
3453 break; 3453 break;
3454 3454
3455 // Get the spy list 3455 // Get the spy list
3456 case SIOCGIWSPY: 3456 case SIOCGIWSPY:
3457 3457
3458 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSPY \n"); 3458 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSPY \n");
3459 rc = -EOPNOTSUPP; 3459 rc = -EOPNOTSUPP;
3460 break; 3460 break;
3461 3461
3462#endif // WIRELESS_SPY 3462#endif // WIRELESS_SPY
3463 3463
3464 case SIOCGIWPRIV: 3464 case SIOCGIWPRIV:
3465 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPRIV \n"); 3465 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPRIV \n");
3466 rc = -EOPNOTSUPP; 3466 rc = -EOPNOTSUPP;
3467/* 3467/*
3468 if(wrq->u.data.pointer) { 3468 if(wrq->u.data.pointer) {
@@ -3480,29 +3480,29 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3480//2008-0409-07, <Add> by Einsn Liu 3480//2008-0409-07, <Add> by Einsn Liu
3481#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 3481#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
3482 case SIOCSIWAUTH: 3482 case SIOCSIWAUTH:
3483 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH \n"); 3483 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH \n");
3484 rc = iwctl_siwauth(dev, NULL, &(wrq->u.param), NULL); 3484 rc = iwctl_siwauth(dev, NULL, &(wrq->u.param), NULL);
3485 break; 3485 break;
3486 3486
3487 case SIOCGIWAUTH: 3487 case SIOCGIWAUTH:
3488 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAUTH \n"); 3488 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAUTH \n");
3489 rc = iwctl_giwauth(dev, NULL, &(wrq->u.param), NULL); 3489 rc = iwctl_giwauth(dev, NULL, &(wrq->u.param), NULL);
3490 break; 3490 break;
3491 3491
3492 case SIOCSIWGENIE: 3492 case SIOCSIWGENIE:
3493 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWGENIE \n"); 3493 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWGENIE \n");
3494 rc = iwctl_siwgenie(dev, NULL, &(wrq->u.data), wrq->u.data.pointer); 3494 rc = iwctl_siwgenie(dev, NULL, &(wrq->u.data), wrq->u.data.pointer);
3495 break; 3495 break;
3496 3496
3497 case SIOCGIWGENIE: 3497 case SIOCGIWGENIE:
3498 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWGENIE \n"); 3498 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWGENIE \n");
3499 rc = iwctl_giwgenie(dev, NULL, &(wrq->u.data), wrq->u.data.pointer); 3499 rc = iwctl_giwgenie(dev, NULL, &(wrq->u.data), wrq->u.data.pointer);
3500 break; 3500 break;
3501 3501
3502 case SIOCSIWENCODEEXT: 3502 case SIOCSIWENCODEEXT:
3503 { 3503 {
3504 char extra[sizeof(struct iw_encode_ext)+MAX_KEY_LEN+1]; 3504 char extra[sizeof(struct iw_encode_ext)+MAX_KEY_LEN+1];
3505 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODEEXT \n"); 3505 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODEEXT \n");
3506 if(wrq->u.encoding.pointer){ 3506 if(wrq->u.encoding.pointer){
3507 memset(extra, 0, sizeof(struct iw_encode_ext)+MAX_KEY_LEN+1); 3507 memset(extra, 0, sizeof(struct iw_encode_ext)+MAX_KEY_LEN+1);
3508 if(wrq->u.encoding.length > (sizeof(struct iw_encode_ext)+ MAX_KEY_LEN)){ 3508 if(wrq->u.encoding.length > (sizeof(struct iw_encode_ext)+ MAX_KEY_LEN)){
@@ -3522,12 +3522,12 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3522 break; 3522 break;
3523 3523
3524 case SIOCGIWENCODEEXT: 3524 case SIOCGIWENCODEEXT:
3525 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODEEXT \n"); 3525 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODEEXT \n");
3526 rc = iwctl_giwencodeext(dev, NULL, &(wrq->u.encoding), NULL); 3526 rc = iwctl_giwencodeext(dev, NULL, &(wrq->u.encoding), NULL);
3527 break; 3527 break;
3528 3528
3529 case SIOCSIWMLME: 3529 case SIOCSIWMLME:
3530 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMLME \n"); 3530 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMLME \n");
3531 rc = iwctl_siwmlme(dev, NULL, &(wrq->u.data), wrq->u.data.pointer); 3531 rc = iwctl_siwmlme(dev, NULL, &(wrq->u.data), wrq->u.data.pointer);
3532 break; 3532 break;
3533 3533
@@ -3586,7 +3586,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3586 3586
3587 default: 3587 default:
3588 rc = -EOPNOTSUPP; 3588 rc = -EOPNOTSUPP;
3589 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Ioctl command not support..%x\n", cmd); 3589 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Ioctl command not support..%x\n", cmd);
3590 3590
3591 3591
3592 } 3592 }
@@ -3599,7 +3599,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3599 spin_unlock_irq(&pDevice->lock); 3599 spin_unlock_irq(&pDevice->lock);
3600 } 3600 }
3601 else { 3601 else {
3602 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Commit the settings\n"); 3602 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Commit the settings\n");
3603 spin_lock_irq(&pDevice->lock); 3603 spin_lock_irq(&pDevice->lock);
3604 pDevice->bLinkPass = FALSE; 3604 pDevice->bLinkPass = FALSE;
3605 memset(pMgmt->abyCurrBSSID, 0, 6); 3605 memset(pMgmt->abyCurrBSSID, 0, 6);
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index a3abce98df0..f7a5a662a3b 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -418,7 +418,7 @@ device_receive_frame (
418 PS802_11Header pMACHeader; 418 PS802_11Header pMACHeader;
419 BOOL bRxeapol_key = FALSE; 419 BOOL bRxeapol_key = FALSE;
420 420
421// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- device_receive_frame---\n"); 421// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- device_receive_frame---\n");
422 422
423 skb = pRDInfo->skb; 423 skb = pRDInfo->skb;
424 424
@@ -436,7 +436,7 @@ device_receive_frame (
436 // Min (ACK): 10HD +4CRC + 2Padding + 4Len + 8TSF + 4RSR 436 // Min (ACK): 10HD +4CRC + 2Padding + 4Len + 8TSF + 4RSR
437 if ((FrameSize > 2364)||(FrameSize <= 32)) { 437 if ((FrameSize > 2364)||(FrameSize <= 32)) {
438 // Frame Size error drop this packet. 438 // Frame Size error drop this packet.
439 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 1 \n"); 439 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 1 \n");
440 return FALSE; 440 return FALSE;
441 } 441 }
442 442
@@ -454,7 +454,7 @@ device_receive_frame (
454 454
455 if ((FrameSize > 2346)|(FrameSize < 14)) { // Max: 2312Payload + 30HD +4CRC 455 if ((FrameSize > 2346)|(FrameSize < 14)) { // Max: 2312Payload + 30HD +4CRC
456 // Min: 14 bytes ACK 456 // Min: 14 bytes ACK
457 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 2 \n"); 457 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 2 \n");
458 return FALSE; 458 return FALSE;
459 } 459 }
460//PLICE_DEBUG-> 460//PLICE_DEBUG->
@@ -535,7 +535,7 @@ device_receive_frame (
535 if (IS_FC_WEP(pbyFrame)) { 535 if (IS_FC_WEP(pbyFrame)) {
536 BOOL bRxDecryOK = FALSE; 536 BOOL bRxDecryOK = FALSE;
537 537
538 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"rx WEP pkt\n"); 538 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"rx WEP pkt\n");
539 bIsWEP = TRUE; 539 bIsWEP = TRUE;
540 if ((pDevice->bEnableHostWEP) && (iSANodeIndex >= 0)) { 540 if ((pDevice->bEnableHostWEP) && (iSANodeIndex >= 0)) {
541 pKey = &STempKey; 541 pKey = &STempKey;
@@ -573,7 +573,7 @@ device_receive_frame (
573 573
574 if (bRxDecryOK) { 574 if (bRxDecryOK) {
575 if ((*pbyNewRsr & NEWRSR_DECRYPTOK) == 0) { 575 if ((*pbyNewRsr & NEWRSR_DECRYPTOK) == 0) {
576 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV Fail\n"); 576 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV Fail\n");
577 if ( (pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPA) || 577 if ( (pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPA) ||
578 (pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) || 578 (pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) ||
579 (pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) || 579 (pDevice->pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) ||
@@ -591,7 +591,7 @@ device_receive_frame (
591 return FALSE; 591 return FALSE;
592 } 592 }
593 } else { 593 } else {
594 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WEP Func Fail\n"); 594 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WEP Func Fail\n");
595 return FALSE; 595 return FALSE;
596 } 596 }
597 if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_CCMP)) 597 if ((pKey != NULL) && (pKey->byCipherSuite == KEY_CTL_CCMP))
@@ -699,7 +699,7 @@ device_receive_frame (
699 if (BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) { 699 if (BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) {
700 if (bDeFragRx) { 700 if (bDeFragRx) {
701 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { 701 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
702 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", 702 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
703 pDevice->dev->name); 703 pDevice->dev->name);
704 } 704 }
705 } 705 }
@@ -712,7 +712,7 @@ device_receive_frame (
712 BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) { 712 BITbIsBitOff(*pbyRsr, RSR_BSSIDOK)) {
713 if (bDeFragRx) { 713 if (bDeFragRx) {
714 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { 714 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
715 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", 715 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
716 pDevice->dev->name); 716 pDevice->dev->name);
717 } 717 }
718 } 718 }
@@ -798,7 +798,7 @@ device_receive_frame (
798 wEtherType = (skb->data[cbIVOffset + 4 + 24 + 6] << 8) | 798 wEtherType = (skb->data[cbIVOffset + 4 + 24 + 6] << 8) |
799 skb->data[cbIVOffset + 4 + 24 + 6 + 1]; 799 skb->data[cbIVOffset + 4 + 24 + 6 + 1];
800 800
801 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wEtherType = %04x \n", wEtherType); 801 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wEtherType = %04x \n", wEtherType);
802 if (wEtherType == ETH_P_PAE) { 802 if (wEtherType == ETH_P_PAE) {
803 skb->dev = pDevice->apdev; 803 skb->dev = pDevice->apdev;
804 804
@@ -875,18 +875,18 @@ device_receive_frame (
875 pdwMIC_R = (PDWORD)(skb->data + 4 + FrameSize + 4); 875 pdwMIC_R = (PDWORD)(skb->data + 4 + FrameSize + 4);
876 //DBG_PRN_GRP12(("RxL: %lx, RxR: %lx\n", *pdwMIC_L, *pdwMIC_R)); 876 //DBG_PRN_GRP12(("RxL: %lx, RxR: %lx\n", *pdwMIC_L, *pdwMIC_R));
877 //DBG_PRN_GRP12(("LocalL: %lx, LocalR: %lx\n", dwLocalMIC_L, dwLocalMIC_R)); 877 //DBG_PRN_GRP12(("LocalL: %lx, LocalR: %lx\n", dwLocalMIC_L, dwLocalMIC_R));
878 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwMICKey0= %lx,dwMICKey1= %lx \n", dwMICKey0, dwMICKey1); 878 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwMICKey0= %lx,dwMICKey1= %lx \n", dwMICKey0, dwMICKey1);
879 879
880 880
881 if ((cpu_to_le32(*pdwMIC_L) != dwLocalMIC_L) || (cpu_to_le32(*pdwMIC_R) != dwLocalMIC_R) || 881 if ((cpu_to_le32(*pdwMIC_L) != dwLocalMIC_L) || (cpu_to_le32(*pdwMIC_R) != dwLocalMIC_R) ||
882 (pDevice->bRxMICFail == TRUE)) { 882 (pDevice->bRxMICFail == TRUE)) {
883 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC comparison is fail!\n"); 883 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC comparison is fail!\n");
884 pDevice->bRxMICFail = FALSE; 884 pDevice->bRxMICFail = FALSE;
885 //pDevice->s802_11Counter.TKIPLocalMICFailures.QuadPart++; 885 //pDevice->s802_11Counter.TKIPLocalMICFailures.QuadPart++;
886 pDevice->s802_11Counter.TKIPLocalMICFailures++; 886 pDevice->s802_11Counter.TKIPLocalMICFailures++;
887 if (bDeFragRx) { 887 if (bDeFragRx) {
888 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { 888 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
889 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", 889 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
890 pDevice->dev->name); 890 pDevice->dev->name);
891 } 891 }
892 } 892 }
@@ -970,7 +970,7 @@ device_receive_frame (
970 if ( (wRxTSC15_0 < wLocalTSC15_0) && 970 if ( (wRxTSC15_0 < wLocalTSC15_0) &&
971 (dwRxTSC47_16 <= dwLocalTSC47_16) && 971 (dwRxTSC47_16 <= dwLocalTSC47_16) &&
972 !((dwRxTSC47_16 == 0) && (dwLocalTSC47_16 == 0xFFFFFFFF))) { 972 !((dwRxTSC47_16 == 0) && (dwLocalTSC47_16 == 0xFFFFFFFF))) {
973 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC is illegal~~!\n "); 973 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC is illegal~~!\n ");
974 if (pKey->byCipherSuite == KEY_CTL_TKIP) 974 if (pKey->byCipherSuite == KEY_CTL_TKIP)
975 //pDevice->s802_11Counter.TKIPReplays.QuadPart++; 975 //pDevice->s802_11Counter.TKIPReplays.QuadPart++;
976 pDevice->s802_11Counter.TKIPReplays++; 976 pDevice->s802_11Counter.TKIPReplays++;
@@ -980,7 +980,7 @@ device_receive_frame (
980 980
981 if (bDeFragRx) { 981 if (bDeFragRx) {
982 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { 982 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
983 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", 983 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
984 pDevice->dev->name); 984 pDevice->dev->name);
985 } 985 }
986 } 986 }
@@ -1016,7 +1016,7 @@ device_receive_frame (
1016 1016
1017 if (bDeFragRx) { 1017 if (bDeFragRx) {
1018 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { 1018 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
1019 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", 1019 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
1020 pDevice->dev->name); 1020 pDevice->dev->name);
1021 } 1021 }
1022 } 1022 }
@@ -1046,7 +1046,7 @@ device_receive_frame (
1046 pStats->rx_dropped++; 1046 pStats->rx_dropped++;
1047 if (bDeFragRx) { 1047 if (bDeFragRx) {
1048 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { 1048 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
1049 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", 1049 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
1050 pDevice->dev->name); 1050 pDevice->dev->name);
1051 } 1051 }
1052 } 1052 }
@@ -1062,7 +1062,7 @@ device_receive_frame (
1062 1062
1063 if (bDeFragRx) { 1063 if (bDeFragRx) {
1064 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) { 1064 if (!device_alloc_frag_buf(pDevice, &pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx])) {
1065 DEVICE_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n", 1065 DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc more frag bufs\n",
1066 pDevice->dev->name); 1066 pDevice->dev->name);
1067 } 1067 }
1068 return FALSE; 1068 return FALSE;
@@ -1100,7 +1100,7 @@ static BOOL s_bAPModeRxCtl (
1100 (WLAN_MGMT_REASON_CLASS2_NONAUTH), 1100 (WLAN_MGMT_REASON_CLASS2_NONAUTH),
1101 &Status 1101 &Status
1102 ); 1102 );
1103 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDeAuthenBeginSta 1\n"); 1103 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDeAuthenBeginSta 1\n");
1104 return TRUE; 1104 return TRUE;
1105 }; 1105 };
1106 if (pMgmt->sNodeDBTable[iSANodeIndex].eNodeState < NODE_ASSOC) { 1106 if (pMgmt->sNodeDBTable[iSANodeIndex].eNodeState < NODE_ASSOC) {
@@ -1112,7 +1112,7 @@ static BOOL s_bAPModeRxCtl (
1112 (WLAN_MGMT_REASON_CLASS3_NONASSOC), 1112 (WLAN_MGMT_REASON_CLASS3_NONASSOC),
1113 &Status 1113 &Status
1114 ); 1114 );
1115 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDisassocBeginSta 2\n"); 1115 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDisassocBeginSta 2\n");
1116 return TRUE; 1116 return TRUE;
1117 }; 1117 };
1118 1118
@@ -1121,7 +1121,7 @@ static BOOL s_bAPModeRxCtl (
1121 if (IS_CTL_PSPOLL(pbyFrame)) { 1121 if (IS_CTL_PSPOLL(pbyFrame)) {
1122 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE; 1122 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE;
1123 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL); 1123 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL);
1124 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 1\n"); 1124 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 1\n");
1125 } 1125 }
1126 else { 1126 else {
1127 // check Data PS state 1127 // check Data PS state
@@ -1130,7 +1130,7 @@ static BOOL s_bAPModeRxCtl (
1130 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE; 1130 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE;
1131 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE; 1131 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE;
1132 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL); 1132 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL);
1133 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 2\n"); 1133 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 2\n");
1134 } 1134 }
1135 } 1135 }
1136 } 1136 }
@@ -1146,7 +1146,7 @@ static BOOL s_bAPModeRxCtl (
1146 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE; 1146 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE;
1147 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE; 1147 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE;
1148 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL); 1148 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL);
1149 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 3\n"); 1149 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 3\n");
1150 1150
1151 } 1151 }
1152 } 1152 }
@@ -1159,8 +1159,8 @@ static BOOL s_bAPModeRxCtl (
1159 (WLAN_MGMT_REASON_CLASS2_NONAUTH), 1159 (WLAN_MGMT_REASON_CLASS2_NONAUTH),
1160 &Status 1160 &Status
1161 ); 1161 );
1162 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDeAuthenBeginSta 3\n"); 1162 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDeAuthenBeginSta 3\n");
1163 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BSSID:%02x-%02x-%02x=%02x-%02x-%02x \n", 1163 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BSSID:%02x-%02x-%02x=%02x-%02x-%02x \n",
1164 p802_11Header->abyAddr3[0], 1164 p802_11Header->abyAddr3[0],
1165 p802_11Header->abyAddr3[1], 1165 p802_11Header->abyAddr3[1],
1166 p802_11Header->abyAddr3[2], 1166 p802_11Header->abyAddr3[2],
@@ -1168,7 +1168,7 @@ static BOOL s_bAPModeRxCtl (
1168 p802_11Header->abyAddr3[4], 1168 p802_11Header->abyAddr3[4],
1169 p802_11Header->abyAddr3[5] 1169 p802_11Header->abyAddr3[5]
1170 ); 1170 );
1171 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR2:%02x-%02x-%02x=%02x-%02x-%02x \n", 1171 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR2:%02x-%02x-%02x=%02x-%02x-%02x \n",
1172 p802_11Header->abyAddr2[0], 1172 p802_11Header->abyAddr2[0],
1173 p802_11Header->abyAddr2[1], 1173 p802_11Header->abyAddr2[1],
1174 p802_11Header->abyAddr2[2], 1174 p802_11Header->abyAddr2[2],
@@ -1176,7 +1176,7 @@ static BOOL s_bAPModeRxCtl (
1176 p802_11Header->abyAddr2[4], 1176 p802_11Header->abyAddr2[4],
1177 p802_11Header->abyAddr2[5] 1177 p802_11Header->abyAddr2[5]
1178 ); 1178 );
1179 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR1:%02x-%02x-%02x=%02x-%02x-%02x \n", 1179 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR1:%02x-%02x-%02x=%02x-%02x-%02x \n",
1180 p802_11Header->abyAddr1[0], 1180 p802_11Header->abyAddr1[0],
1181 p802_11Header->abyAddr1[1], 1181 p802_11Header->abyAddr1[1],
1182 p802_11Header->abyAddr1[2], 1182 p802_11Header->abyAddr1[2],
@@ -1184,9 +1184,9 @@ static BOOL s_bAPModeRxCtl (
1184 p802_11Header->abyAddr1[4], 1184 p802_11Header->abyAddr1[4],
1185 p802_11Header->abyAddr1[5] 1185 p802_11Header->abyAddr1[5]
1186 ); 1186 );
1187 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: wFrameCtl= %x\n", p802_11Header->wFrameCtl ); 1187 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: wFrameCtl= %x\n", p802_11Header->wFrameCtl );
1188 VNSvInPortB(pDevice->PortOffset + MAC_REG_RCR, &(pDevice->byRxMode)); 1188 VNSvInPortB(pDevice->PortOffset + MAC_REG_RCR, &(pDevice->byRxMode));
1189 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc:pDevice->byRxMode = %x\n", pDevice->byRxMode ); 1189 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc:pDevice->byRxMode = %x\n", pDevice->byRxMode );
1190 return TRUE; 1190 return TRUE;
1191 } 1191 }
1192 } 1192 }
@@ -1226,7 +1226,7 @@ static BOOL s_bHandleRxEncryption (
1226 } 1226 }
1227 byKeyIdx = (*(pbyIV+3) & 0xc0); 1227 byKeyIdx = (*(pbyIV+3) & 0xc0);
1228 byKeyIdx >>= 6; 1228 byKeyIdx >>= 6;
1229 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\nKeyIdx: %d\n", byKeyIdx); 1229 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\nKeyIdx: %d\n", byKeyIdx);
1230 1230
1231 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) || 1231 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) ||
1232 (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) || 1232 (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK) ||
@@ -1236,14 +1236,14 @@ static BOOL s_bHandleRxEncryption (
1236 if (((*pbyRsr & (RSR_ADDRBROAD | RSR_ADDRMULTI)) == 0) && 1236 if (((*pbyRsr & (RSR_ADDRBROAD | RSR_ADDRMULTI)) == 0) &&
1237 (pDevice->pMgmt->byCSSPK != KEY_CTL_NONE)) { 1237 (pDevice->pMgmt->byCSSPK != KEY_CTL_NONE)) {
1238 // unicast pkt use pairwise key 1238 // unicast pkt use pairwise key
1239 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"unicast pkt\n"); 1239 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"unicast pkt\n");
1240 if (KeybGetKey(&(pDevice->sKey), pDevice->abyBSSID, 0xFFFFFFFF, &pKey) == TRUE) { 1240 if (KeybGetKey(&(pDevice->sKey), pDevice->abyBSSID, 0xFFFFFFFF, &pKey) == TRUE) {
1241 if (pDevice->pMgmt->byCSSPK == KEY_CTL_TKIP) 1241 if (pDevice->pMgmt->byCSSPK == KEY_CTL_TKIP)
1242 byDecMode = KEY_CTL_TKIP; 1242 byDecMode = KEY_CTL_TKIP;
1243 else if (pDevice->pMgmt->byCSSPK == KEY_CTL_CCMP) 1243 else if (pDevice->pMgmt->byCSSPK == KEY_CTL_CCMP)
1244 byDecMode = KEY_CTL_CCMP; 1244 byDecMode = KEY_CTL_CCMP;
1245 } 1245 }
1246 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"unicast pkt: %d, %p\n", byDecMode, pKey); 1246 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"unicast pkt: %d, %p\n", byDecMode, pKey);
1247 } else { 1247 } else {
1248 // use group key 1248 // use group key
1249 KeybGetKey(&(pDevice->sKey), pDevice->abyBSSID, byKeyIdx, &pKey); 1249 KeybGetKey(&(pDevice->sKey), pDevice->abyBSSID, byKeyIdx, &pKey);
@@ -1251,7 +1251,7 @@ static BOOL s_bHandleRxEncryption (
1251 byDecMode = KEY_CTL_TKIP; 1251 byDecMode = KEY_CTL_TKIP;
1252 else if (pDevice->pMgmt->byCSSGK == KEY_CTL_CCMP) 1252 else if (pDevice->pMgmt->byCSSGK == KEY_CTL_CCMP)
1253 byDecMode = KEY_CTL_CCMP; 1253 byDecMode = KEY_CTL_CCMP;
1254 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"group pkt: %d, %d, %p\n", byKeyIdx, byDecMode, pKey); 1254 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"group pkt: %d, %d, %p\n", byKeyIdx, byDecMode, pKey);
1255 } 1255 }
1256 } 1256 }
1257 // our WEP only support Default Key 1257 // our WEP only support Default Key
@@ -1265,10 +1265,10 @@ static BOOL s_bHandleRxEncryption (
1265 } 1265 }
1266 *pKeyOut = pKey; 1266 *pKeyOut = pKey;
1267 1267
1268 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"AES:%d %d %d\n", pDevice->pMgmt->byCSSPK, pDevice->pMgmt->byCSSGK, byDecMode); 1268 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"AES:%d %d %d\n", pDevice->pMgmt->byCSSPK, pDevice->pMgmt->byCSSGK, byDecMode);
1269 1269
1270 if (pKey == NULL) { 1270 if (pKey == NULL) {
1271 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey == NULL\n"); 1271 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey == NULL\n");
1272 if (byDecMode == KEY_CTL_WEP) { 1272 if (byDecMode == KEY_CTL_WEP) {
1273// pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++; 1273// pDevice->s802_11Counter.WEPUndecryptableCount.QuadPart++;
1274 } else if (pDevice->bLinkPass == TRUE) { 1274 } else if (pDevice->bLinkPass == TRUE) {
@@ -1309,13 +1309,13 @@ static BOOL s_bHandleRxEncryption (
1309 1309
1310 PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc 1310 PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
1311 *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4)); 1311 *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
1312 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16); 1312 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
1313 if (byDecMode == KEY_CTL_TKIP) { 1313 if (byDecMode == KEY_CTL_TKIP) {
1314 *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV)); 1314 *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
1315 } else { 1315 } else {
1316 *pwRxTSC15_0 = cpu_to_le16(*(PWORD)pbyIV); 1316 *pwRxTSC15_0 = cpu_to_le16(*(PWORD)pbyIV);
1317 } 1317 }
1318 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC0_15: %x\n", *pwRxTSC15_0); 1318 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC0_15: %x\n", *pwRxTSC15_0);
1319 1319
1320 if ((byDecMode == KEY_CTL_TKIP) && 1320 if ((byDecMode == KEY_CTL_TKIP) &&
1321 (pDevice->byLocalID <= REV_ID_VT3253_A1)) { 1321 (pDevice->byLocalID <= REV_ID_VT3253_A1)) {
@@ -1327,10 +1327,10 @@ static BOOL s_bHandleRxEncryption (
1327 rc4_encrypt(&pDevice->SBox, pbyIV+8, pbyIV+8, PayloadLen); 1327 rc4_encrypt(&pDevice->SBox, pbyIV+8, pbyIV+8, PayloadLen);
1328 if (ETHbIsBufferCrc32Ok(pbyIV+8, PayloadLen)) { 1328 if (ETHbIsBufferCrc32Ok(pbyIV+8, PayloadLen)) {
1329 *pbyNewRsr |= NEWRSR_DECRYPTOK; 1329 *pbyNewRsr |= NEWRSR_DECRYPTOK;
1330 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV OK!\n"); 1330 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV OK!\n");
1331 } else { 1331 } else {
1332 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV FAIL!!!\n"); 1332 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV FAIL!!!\n");
1333 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PayloadLen = %d\n", PayloadLen); 1333 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PayloadLen = %d\n", PayloadLen);
1334 } 1334 }
1335 } 1335 }
1336 }// end of TKIP/AES 1336 }// end of TKIP/AES
@@ -1373,7 +1373,7 @@ static BOOL s_bHostWepRxEncryption (
1373 } 1373 }
1374 byKeyIdx = (*(pbyIV+3) & 0xc0); 1374 byKeyIdx = (*(pbyIV+3) & 0xc0);
1375 byKeyIdx >>= 6; 1375 byKeyIdx >>= 6;
1376 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\nKeyIdx: %d\n", byKeyIdx); 1376 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\nKeyIdx: %d\n", byKeyIdx);
1377 1377
1378 1378
1379 if (pDevice->pMgmt->byCSSGK == KEY_CTL_TKIP) 1379 if (pDevice->pMgmt->byCSSGK == KEY_CTL_TKIP)
@@ -1381,7 +1381,7 @@ static BOOL s_bHostWepRxEncryption (
1381 else if (pDevice->pMgmt->byCSSGK == KEY_CTL_CCMP) 1381 else if (pDevice->pMgmt->byCSSGK == KEY_CTL_CCMP)
1382 byDecMode = KEY_CTL_CCMP; 1382 byDecMode = KEY_CTL_CCMP;
1383 1383
1384 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"AES:%d %d %d\n", pDevice->pMgmt->byCSSPK, pDevice->pMgmt->byCSSGK, byDecMode); 1384 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"AES:%d %d %d\n", pDevice->pMgmt->byCSSPK, pDevice->pMgmt->byCSSGK, byDecMode);
1385 1385
1386 if (byDecMode != pKey->byCipherSuite) { 1386 if (byDecMode != pKey->byCipherSuite) {
1387 if (byDecMode == KEY_CTL_WEP) { 1387 if (byDecMode == KEY_CTL_WEP) {
@@ -1394,7 +1394,7 @@ static BOOL s_bHostWepRxEncryption (
1394 1394
1395 if (byDecMode == KEY_CTL_WEP) { 1395 if (byDecMode == KEY_CTL_WEP) {
1396 // handle WEP 1396 // handle WEP
1397 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP \n"); 1397 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP \n");
1398 if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || 1398 if ((pDevice->byLocalID <= REV_ID_VT3253_A1) ||
1399 (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE) || 1399 (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE) ||
1400 (bOnFly == FALSE)) { 1400 (bOnFly == FALSE)) {
@@ -1419,31 +1419,31 @@ static BOOL s_bHostWepRxEncryption (
1419 1419
1420 PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc 1420 PayloadLen -= (WLAN_HDR_ADDR3_LEN + 8 + 4); // 24 is 802.11 header, 8 is IV&ExtIV, 4 is crc
1421 *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4)); 1421 *pdwRxTSC47_16 = cpu_to_le32(*(PDWORD)(pbyIV + 4));
1422 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16); 1422 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ExtIV: %lx\n",*pdwRxTSC47_16);
1423 1423
1424 if (byDecMode == KEY_CTL_TKIP) { 1424 if (byDecMode == KEY_CTL_TKIP) {
1425 *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV)); 1425 *pwRxTSC15_0 = cpu_to_le16(MAKEWORD(*(pbyIV+2), *pbyIV));
1426 } else { 1426 } else {
1427 *pwRxTSC15_0 = cpu_to_le16(*(PWORD)pbyIV); 1427 *pwRxTSC15_0 = cpu_to_le16(*(PWORD)pbyIV);
1428 } 1428 }
1429 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC0_15: %x\n", *pwRxTSC15_0); 1429 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TSC0_15: %x\n", *pwRxTSC15_0);
1430 1430
1431 if (byDecMode == KEY_CTL_TKIP) { 1431 if (byDecMode == KEY_CTL_TKIP) {
1432 if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (bOnFly == FALSE)) { 1432 if ((pDevice->byLocalID <= REV_ID_VT3253_A1) || (bOnFly == FALSE)) {
1433 // Software TKIP 1433 // Software TKIP
1434 // 1. 3253 A 1434 // 1. 3253 A
1435 // 2. NotOnFly 1435 // 2. NotOnFly
1436 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"soft KEY_CTL_TKIP \n"); 1436 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"soft KEY_CTL_TKIP \n");
1437 pMACHeader = (PS802_11Header) (pbyFrame); 1437 pMACHeader = (PS802_11Header) (pbyFrame);
1438 TKIPvMixKey(pKey->abyKey, pMACHeader->abyAddr2, *pwRxTSC15_0, *pdwRxTSC47_16, pDevice->abyPRNG); 1438 TKIPvMixKey(pKey->abyKey, pMACHeader->abyAddr2, *pwRxTSC15_0, *pdwRxTSC47_16, pDevice->abyPRNG);
1439 rc4_init(&pDevice->SBox, pDevice->abyPRNG, TKIP_KEY_LEN); 1439 rc4_init(&pDevice->SBox, pDevice->abyPRNG, TKIP_KEY_LEN);
1440 rc4_encrypt(&pDevice->SBox, pbyIV+8, pbyIV+8, PayloadLen); 1440 rc4_encrypt(&pDevice->SBox, pbyIV+8, pbyIV+8, PayloadLen);
1441 if (ETHbIsBufferCrc32Ok(pbyIV+8, PayloadLen)) { 1441 if (ETHbIsBufferCrc32Ok(pbyIV+8, PayloadLen)) {
1442 *pbyNewRsr |= NEWRSR_DECRYPTOK; 1442 *pbyNewRsr |= NEWRSR_DECRYPTOK;
1443 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV OK!\n"); 1443 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV OK!\n");
1444 } else { 1444 } else {
1445 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV FAIL!!!\n"); 1445 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ICV FAIL!!!\n");
1446 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PayloadLen = %d\n", PayloadLen); 1446 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PayloadLen = %d\n", PayloadLen);
1447 } 1447 }
1448 } 1448 }
1449 } 1449 }
@@ -1452,12 +1452,12 @@ static BOOL s_bHostWepRxEncryption (
1452 if (bOnFly == FALSE) { 1452 if (bOnFly == FALSE) {
1453 // Software CCMP 1453 // Software CCMP
1454 // NotOnFly 1454 // NotOnFly
1455 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"soft KEY_CTL_CCMP\n"); 1455 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"soft KEY_CTL_CCMP\n");
1456 if (AESbGenCCMP(pKey->abyKey, pbyFrame, FrameSize)) { 1456 if (AESbGenCCMP(pKey->abyKey, pbyFrame, FrameSize)) {
1457 *pbyNewRsr |= NEWRSR_DECRYPTOK; 1457 *pbyNewRsr |= NEWRSR_DECRYPTOK;
1458 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CCMP MIC compare OK!\n"); 1458 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CCMP MIC compare OK!\n");
1459 } else { 1459 } else {
1460 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CCMP MIC fail!\n"); 1460 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"CCMP MIC fail!\n");
1461 } 1461 }
1462 } 1462 }
1463 } 1463 }
@@ -1500,7 +1500,7 @@ static BOOL s_bAPModeRxData (
1500 skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz); 1500 skbcpy = dev_alloc_skb((int)pDevice->rx_buf_sz);
1501 // if any node in PS mode, buffer packet until DTIM. 1501 // if any node in PS mode, buffer packet until DTIM.
1502 if (skbcpy == NULL) { 1502 if (skbcpy == NULL) {
1503 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "relay multicast no skb available \n"); 1503 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "relay multicast no skb available \n");
1504 } 1504 }
1505 else { 1505 else {
1506 skbcpy->dev = pDevice->dev; 1506 skbcpy->dev = pDevice->dev;
@@ -1530,7 +1530,7 @@ static BOOL s_bAPModeRxData (
1530 pMgmt->sNodeDBTable[iDANodeIndex].wEnQueueCnt++; 1530 pMgmt->sNodeDBTable[iDANodeIndex].wEnQueueCnt++;
1531 wAID = pMgmt->sNodeDBTable[iDANodeIndex].wAID; 1531 wAID = pMgmt->sNodeDBTable[iDANodeIndex].wAID;
1532 pMgmt->abyPSTxMap[wAID >> 3] |= byMask[wAID & 7]; 1532 pMgmt->abyPSTxMap[wAID >> 3] |= byMask[wAID & 7];
1533 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "relay: index= %d, pMgmt->abyPSTxMap[%d]= %d\n", 1533 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "relay: index= %d, pMgmt->abyPSTxMap[%d]= %d\n",
1534 iDANodeIndex, (wAID >> 3), pMgmt->abyPSTxMap[wAID >> 3]); 1534 iDANodeIndex, (wAID >> 3), pMgmt->abyPSTxMap[wAID >> 3]);
1535 return TRUE; 1535 return TRUE;
1536 } 1536 }
diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
index bf15e266ffe..dfe4e0aa352 100644
--- a/drivers/staging/vt6655/hostap.c
+++ b/drivers/staging/vt6655/hostap.c
@@ -107,7 +107,7 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
107 .ndo_start_xmit = pDevice->tx_80211, 107 .ndo_start_xmit = pDevice->tx_80211,
108 }; 108 };
109 109
110 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name); 110 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
111 111
112 pDevice->apdev = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL); 112 pDevice->apdev = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL);
113 if (pDevice->apdev == NULL) 113 if (pDevice->apdev == NULL)
@@ -132,12 +132,12 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
132 else 132 else
133 ret = register_netdev(pDevice->apdev); 133 ret = register_netdev(pDevice->apdev);
134 if (ret) { 134 if (ret) {
135 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: register_netdevice(AP) failed!\n", 135 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: register_netdevice(AP) failed!\n",
136 dev->name); 136 dev->name);
137 return -1; 137 return -1;
138 } 138 }
139 139
140 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Registered netdevice %s for AP management\n", 140 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Registered netdevice %s for AP management\n",
141 dev->name, pDevice->apdev->name); 141 dev->name, pDevice->apdev->name);
142 142
143 KeyvInitTable(&pDevice->sKey, pDevice->PortOffset); 143 KeyvInitTable(&pDevice->sKey, pDevice->PortOffset);
@@ -162,14 +162,14 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
162static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked) 162static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked)
163{ 163{
164 164
165 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: disabling hostapd mode\n", pDevice->dev->name); 165 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: disabling hostapd mode\n", pDevice->dev->name);
166 166
167 if (pDevice->apdev && pDevice->apdev->name && pDevice->apdev->name[0]) { 167 if (pDevice->apdev && pDevice->apdev->name && pDevice->apdev->name[0]) {
168 if (rtnl_locked) 168 if (rtnl_locked)
169 unregister_netdevice(pDevice->apdev); 169 unregister_netdevice(pDevice->apdev);
170 else 170 else
171 unregister_netdev(pDevice->apdev); 171 unregister_netdev(pDevice->apdev);
172 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n", 172 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
173 pDevice->dev->name, pDevice->apdev->name); 173 pDevice->dev->name, pDevice->apdev->name);
174 } 174 }
175 kfree(pDevice->apdev); 175 kfree(pDevice->apdev);
@@ -289,8 +289,8 @@ static int hostap_add_sta(PSDevice pDevice,
289 289
290 pMgmt->sNodeDBTable[uNodeIndex].wAID = (WORD)param->u.add_sta.aid; 290 pMgmt->sNodeDBTable[uNodeIndex].wAID = (WORD)param->u.add_sta.aid;
291 pMgmt->sNodeDBTable[uNodeIndex].ulLastRxJiffer = jiffies; 291 pMgmt->sNodeDBTable[uNodeIndex].ulLastRxJiffer = jiffies;
292 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Add STA AID= %d \n", pMgmt->sNodeDBTable[uNodeIndex].wAID); 292 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Add STA AID= %d \n", pMgmt->sNodeDBTable[uNodeIndex].wAID);
293 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X \n", 293 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X \n",
294 param->sta_addr[0], 294 param->sta_addr[0],
295 param->sta_addr[1], 295 param->sta_addr[1],
296 param->sta_addr[2], 296 param->sta_addr[2],
@@ -298,7 +298,7 @@ static int hostap_add_sta(PSDevice pDevice,
298 param->sta_addr[4], 298 param->sta_addr[4],
299 param->sta_addr[5] 299 param->sta_addr[5]
300 ) ; 300 ) ;
301 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Max Support rate = %d \n", 301 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Max Support rate = %d \n",
302 pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate); 302 pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate);
303 303
304 return 0; 304 return 0;
@@ -390,7 +390,7 @@ static int hostap_set_flags_sta(PSDevice pDevice,
390 if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) { 390 if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &uNodeIndex)) {
391 pMgmt->sNodeDBTable[uNodeIndex].dwFlags |= param->u.set_flags_sta.flags_or; 391 pMgmt->sNodeDBTable[uNodeIndex].dwFlags |= param->u.set_flags_sta.flags_or;
392 pMgmt->sNodeDBTable[uNodeIndex].dwFlags &= param->u.set_flags_sta.flags_and; 392 pMgmt->sNodeDBTable[uNodeIndex].dwFlags &= param->u.set_flags_sta.flags_and;
393 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " dwFlags = %x \n", 393 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " dwFlags = %x \n",
394 (UINT)pMgmt->sNodeDBTable[uNodeIndex].dwFlags); 394 (UINT)pMgmt->sNodeDBTable[uNodeIndex].dwFlags);
395 } 395 }
396 else { 396 else {
@@ -429,18 +429,18 @@ static int hostap_set_generic_element(PSDevice pDevice,
429 429
430 pMgmt->wWPAIELen = param->u.generic_elem.len; 430 pMgmt->wWPAIELen = param->u.generic_elem.len;
431 431
432 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pMgmt->wWPAIELen = %d\n", pMgmt->wWPAIELen); 432 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pMgmt->wWPAIELen = %d\n", pMgmt->wWPAIELen);
433 433
434 // disable wpa 434 // disable wpa
435 if (pMgmt->wWPAIELen == 0) { 435 if (pMgmt->wWPAIELen == 0) {
436 pMgmt->eAuthenMode = WMAC_AUTH_OPEN; 436 pMgmt->eAuthenMode = WMAC_AUTH_OPEN;
437 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " No WPAIE, Disable WPA \n"); 437 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " No WPAIE, Disable WPA \n");
438 } else { 438 } else {
439 // enable wpa 439 // enable wpa
440 if ((pMgmt->abyWPAIE[0] == WLAN_EID_RSN_WPA) || 440 if ((pMgmt->abyWPAIE[0] == WLAN_EID_RSN_WPA) ||
441 (pMgmt->abyWPAIE[0] == WLAN_EID_RSN)) { 441 (pMgmt->abyWPAIE[0] == WLAN_EID_RSN)) {
442 pMgmt->eAuthenMode = WMAC_AUTH_WPANONE; 442 pMgmt->eAuthenMode = WMAC_AUTH_WPANONE;
443 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set WPAIE enable WPA\n"); 443 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set WPAIE enable WPA\n");
444 } else 444 } else
445 return -EINVAL; 445 return -EINVAL;
446 } 446 }
@@ -514,7 +514,7 @@ static int hostap_set_encryption(PSDevice pDevice,
514 514
515 if ((param->u.crypt.idx > 3) || (param->u.crypt.key_len > MAX_KEY_LEN)) { 515 if ((param->u.crypt.idx > 3) || (param->u.crypt.key_len > MAX_KEY_LEN)) {
516 param->u.crypt.err = HOSTAP_CRYPT_ERR_KEY_SET_FAILED; 516 param->u.crypt.err = HOSTAP_CRYPT_ERR_KEY_SET_FAILED;
517 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " HOSTAP_CRYPT_ERR_KEY_SET_FAILED\n"); 517 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " HOSTAP_CRYPT_ERR_KEY_SET_FAILED\n");
518 return -EINVAL; 518 return -EINVAL;
519 } 519 }
520 520
@@ -528,12 +528,12 @@ static int hostap_set_encryption(PSDevice pDevice,
528 } else { 528 } else {
529 if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == FALSE) { 529 if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == FALSE) {
530 param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR; 530 param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR;
531 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " HOSTAP_CRYPT_ERR_UNKNOWN_ADDR\n"); 531 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " HOSTAP_CRYPT_ERR_UNKNOWN_ADDR\n");
532 return -EINVAL; 532 return -EINVAL;
533 } 533 }
534 } 534 }
535 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " hostap_set_encryption: sta_index %d \n", iNodeIndex); 535 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " hostap_set_encryption: sta_index %d \n", iNodeIndex);
536 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " hostap_set_encryption: alg %d \n", param->u.crypt.alg); 536 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " hostap_set_encryption: alg %d \n", param->u.crypt.alg);
537 537
538 if (param->u.crypt.alg == WPA_ALG_NONE) { 538 if (param->u.crypt.alg == WPA_ALG_NONE) {
539 539
@@ -542,7 +542,7 @@ static int hostap_set_encryption(PSDevice pDevice,
542 param->sta_addr, 542 param->sta_addr,
543 pMgmt->sNodeDBTable[iNodeIndex].dwKeyIndex, 543 pMgmt->sNodeDBTable[iNodeIndex].dwKeyIndex,
544 pDevice->PortOffset) == FALSE) { 544 pDevice->PortOffset) == FALSE) {
545 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybRemoveKey fail \n"); 545 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "KeybRemoveKey fail \n");
546 } 546 }
547 pMgmt->sNodeDBTable[iNodeIndex].bOnFly = FALSE; 547 pMgmt->sNodeDBTable[iNodeIndex].bOnFly = FALSE;
548 } 548 }
@@ -677,7 +677,7 @@ static int hostap_set_encryption(PSDevice pDevice,
677 // Key Table Full 677 // Key Table Full
678 pMgmt->sNodeDBTable[iNodeIndex].bOnFly = FALSE; 678 pMgmt->sNodeDBTable[iNodeIndex].bOnFly = FALSE;
679 bKeyTableFull = TRUE; 679 bKeyTableFull = TRUE;
680 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Key Table Full\n"); 680 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Key Table Full\n");
681 } 681 }
682 682
683 } 683 }
@@ -691,10 +691,10 @@ static int hostap_set_encryption(PSDevice pDevice,
691 MACvSetDefaultKeyCtl(pDevice->PortOffset, wKeyCtl, MAX_KEY_TABLE-1, pDevice->byLocalID); 691 MACvSetDefaultKeyCtl(pDevice->PortOffset, wKeyCtl, MAX_KEY_TABLE-1, pDevice->byLocalID);
692 } 692 }
693 693
694 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Set key sta_index= %d \n", iNodeIndex); 694 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Set key sta_index= %d \n", iNodeIndex);
695 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " tx_index=%d len=%d \n", param->u.crypt.idx, 695 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " tx_index=%d len=%d \n", param->u.crypt.idx,
696 param->u.crypt.key_len ); 696 param->u.crypt.key_len );
697 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " key=%x-%x-%x-%x-%x-xxxxx \n", 697 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " key=%x-%x-%x-%x-%x-xxxxx \n",
698 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[0], 698 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[0],
699 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[1], 699 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[1],
700 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[2], 700 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[2],
@@ -746,11 +746,11 @@ static int hostap_get_encryption(PSDevice pDevice,
746 } else { 746 } else {
747 if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == FALSE) { 747 if (BSSDBbIsSTAInNodeDB(pMgmt, param->sta_addr, &iNodeIndex) == FALSE) {
748 param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR; 748 param->u.crypt.err = HOSTAP_CRYPT_ERR_UNKNOWN_ADDR;
749 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_get_encryption: HOSTAP_CRYPT_ERR_UNKNOWN_ADDR\n"); 749 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_get_encryption: HOSTAP_CRYPT_ERR_UNKNOWN_ADDR\n");
750 return -EINVAL; 750 return -EINVAL;
751 } 751 }
752 } 752 }
753 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_get_encryption: %d\n", iNodeIndex); 753 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_get_encryption: %d\n", iNodeIndex);
754 memset(param->u.crypt.seq, 0, 8); 754 memset(param->u.crypt.seq, 0, 8);
755 for (ii = 0 ; ii < 8 ; ii++) { 755 for (ii = 0 ; ii < 8 ; ii++) {
756 param->u.crypt.seq[ii] = (BYTE)pMgmt->sNodeDBTable[iNodeIndex].KeyRSC >> (ii * 8); 756 param->u.crypt.seq[ii] = (BYTE)pMgmt->sNodeDBTable[iNodeIndex].KeyRSC >> (ii * 8);
@@ -795,74 +795,74 @@ int hostap_ioctl(PSDevice pDevice, struct iw_point *p)
795 795
796 switch (param->cmd) { 796 switch (param->cmd) {
797 case VIAWGET_HOSTAPD_SET_ENCRYPTION: 797 case VIAWGET_HOSTAPD_SET_ENCRYPTION:
798 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_ENCRYPTION \n"); 798 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_ENCRYPTION \n");
799 spin_lock_irq(&pDevice->lock); 799 spin_lock_irq(&pDevice->lock);
800 ret = hostap_set_encryption(pDevice, param, p->length); 800 ret = hostap_set_encryption(pDevice, param, p->length);
801 spin_unlock_irq(&pDevice->lock); 801 spin_unlock_irq(&pDevice->lock);
802 break; 802 break;
803 case VIAWGET_HOSTAPD_GET_ENCRYPTION: 803 case VIAWGET_HOSTAPD_GET_ENCRYPTION:
804 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_GET_ENCRYPTION \n"); 804 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_GET_ENCRYPTION \n");
805 spin_lock_irq(&pDevice->lock); 805 spin_lock_irq(&pDevice->lock);
806 ret = hostap_get_encryption(pDevice, param, p->length); 806 ret = hostap_get_encryption(pDevice, param, p->length);
807 spin_unlock_irq(&pDevice->lock); 807 spin_unlock_irq(&pDevice->lock);
808 break; 808 break;
809 case VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR: 809 case VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR:
810 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR \n"); 810 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_ASSOC_AP_ADDR \n");
811 return -EOPNOTSUPP; 811 return -EOPNOTSUPP;
812 break; 812 break;
813 case VIAWGET_HOSTAPD_FLUSH: 813 case VIAWGET_HOSTAPD_FLUSH:
814 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_FLUSH \n"); 814 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_FLUSH \n");
815 spin_lock_irq(&pDevice->lock); 815 spin_lock_irq(&pDevice->lock);
816 hostap_flush_sta(pDevice); 816 hostap_flush_sta(pDevice);
817 spin_unlock_irq(&pDevice->lock); 817 spin_unlock_irq(&pDevice->lock);
818 break; 818 break;
819 case VIAWGET_HOSTAPD_ADD_STA: 819 case VIAWGET_HOSTAPD_ADD_STA:
820 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_ADD_STA \n"); 820 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_ADD_STA \n");
821 spin_lock_irq(&pDevice->lock); 821 spin_lock_irq(&pDevice->lock);
822 ret = hostap_add_sta(pDevice, param); 822 ret = hostap_add_sta(pDevice, param);
823 spin_unlock_irq(&pDevice->lock); 823 spin_unlock_irq(&pDevice->lock);
824 break; 824 break;
825 case VIAWGET_HOSTAPD_REMOVE_STA: 825 case VIAWGET_HOSTAPD_REMOVE_STA:
826 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_REMOVE_STA \n"); 826 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_REMOVE_STA \n");
827 spin_lock_irq(&pDevice->lock); 827 spin_lock_irq(&pDevice->lock);
828 ret = hostap_remove_sta(pDevice, param); 828 ret = hostap_remove_sta(pDevice, param);
829 spin_unlock_irq(&pDevice->lock); 829 spin_unlock_irq(&pDevice->lock);
830 break; 830 break;
831 case VIAWGET_HOSTAPD_GET_INFO_STA: 831 case VIAWGET_HOSTAPD_GET_INFO_STA:
832 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_GET_INFO_STA \n"); 832 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_GET_INFO_STA \n");
833 ret = hostap_get_info_sta(pDevice, param); 833 ret = hostap_get_info_sta(pDevice, param);
834 ap_ioctl = 1; 834 ap_ioctl = 1;
835 break; 835 break;
836/* 836/*
837 case VIAWGET_HOSTAPD_RESET_TXEXC_STA: 837 case VIAWGET_HOSTAPD_RESET_TXEXC_STA:
838 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_RESET_TXEXC_STA \n"); 838 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_RESET_TXEXC_STA \n");
839 ret = hostap_reset_txexc_sta(pDevice, param); 839 ret = hostap_reset_txexc_sta(pDevice, param);
840 break; 840 break;
841*/ 841*/
842 case VIAWGET_HOSTAPD_SET_FLAGS_STA: 842 case VIAWGET_HOSTAPD_SET_FLAGS_STA:
843 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_FLAGS_STA \n"); 843 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_FLAGS_STA \n");
844 ret = hostap_set_flags_sta(pDevice, param); 844 ret = hostap_set_flags_sta(pDevice, param);
845 break; 845 break;
846 846
847 case VIAWGET_HOSTAPD_MLME: 847 case VIAWGET_HOSTAPD_MLME:
848 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_MLME \n"); 848 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_MLME \n");
849 return -EOPNOTSUPP; 849 return -EOPNOTSUPP;
850 850
851 case VIAWGET_HOSTAPD_SET_GENERIC_ELEMENT: 851 case VIAWGET_HOSTAPD_SET_GENERIC_ELEMENT:
852 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_GENERIC_ELEMENT \n"); 852 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SET_GENERIC_ELEMENT \n");
853 ret = hostap_set_generic_element(pDevice, param); 853 ret = hostap_set_generic_element(pDevice, param);
854 break; 854 break;
855 855
856 case VIAWGET_HOSTAPD_SCAN_REQ: 856 case VIAWGET_HOSTAPD_SCAN_REQ:
857 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SCAN_REQ \n"); 857 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_SCAN_REQ \n");
858 return -EOPNOTSUPP; 858 return -EOPNOTSUPP;
859 859
860 case VIAWGET_HOSTAPD_STA_CLEAR_STATS: 860 case VIAWGET_HOSTAPD_STA_CLEAR_STATS:
861 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_STA_CLEAR_STATS \n"); 861 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_HOSTAPD_STA_CLEAR_STATS \n");
862 return -EOPNOTSUPP; 862 return -EOPNOTSUPP;
863 863
864 default: 864 default:
865 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_ioctl: unknown cmd=%d\n", 865 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "hostap_ioctl: unknown cmd=%d\n",
866 (int)param->cmd); 866 (int)param->cmd);
867 return -EOPNOTSUPP; 867 return -EOPNOTSUPP;
868 break; 868 break;
diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
index 4869107a2bc..ddcf504cef5 100644
--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@@ -108,7 +108,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
108 108
109 case WLAN_CMD_BSS_SCAN: 109 case WLAN_CMD_BSS_SCAN:
110 110
111 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_BSS_SCAN..begin \n"); 111 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_BSS_SCAN..begin \n");
112 if (copy_from_user(&sScanCmd, pReq->data, sizeof(SCmdScan))) { 112 if (copy_from_user(&sScanCmd, pReq->data, sizeof(SCmdScan))) {
113 result = -EFAULT; 113 result = -EFAULT;
114 break; 114 break;
@@ -214,31 +214,31 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
214 memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN); 214 memcpy(pMgmt->abyDesireSSID, pItemSSID, pItemSSID->len + WLAN_IEHDR_LEN);
215 if (sJoinCmd.wBSSType == ADHOC) { 215 if (sJoinCmd.wBSSType == ADHOC) {
216 pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA; 216 pMgmt->eConfigMode = WMAC_CONFIG_IBSS_STA;
217 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to adhoc mode\n"); 217 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to adhoc mode\n");
218 } 218 }
219 else { 219 else {
220 pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA; 220 pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;
221 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to STA mode\n"); 221 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to STA mode\n");
222 } 222 }
223 if (sJoinCmd.bPSEnable == TRUE) { 223 if (sJoinCmd.bPSEnable == TRUE) {
224 pDevice->ePSMode = WMAC_POWER_FAST; 224 pDevice->ePSMode = WMAC_POWER_FAST;
225// pDevice->ePSMode = WMAC_POWER_MAX; 225// pDevice->ePSMode = WMAC_POWER_MAX;
226 pMgmt->wListenInterval = 2; 226 pMgmt->wListenInterval = 2;
227 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving On\n"); 227 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving On\n");
228 } 228 }
229 else { 229 else {
230 pDevice->ePSMode = WMAC_POWER_CAM; 230 pDevice->ePSMode = WMAC_POWER_CAM;
231 pMgmt->wListenInterval = 1; 231 pMgmt->wListenInterval = 1;
232 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving Off \n"); 232 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Power Saving Off \n");
233 } 233 }
234 234
235 if (sJoinCmd.bShareKeyAuth == TRUE){ 235 if (sJoinCmd.bShareKeyAuth == TRUE){
236 pMgmt->bShareKeyAlgorithm = TRUE; 236 pMgmt->bShareKeyAlgorithm = TRUE;
237 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key \n"); 237 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key \n");
238 } 238 }
239 else { 239 else {
240 pMgmt->bShareKeyAlgorithm = FALSE; 240 pMgmt->bShareKeyAlgorithm = FALSE;
241 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System \n"); 241 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System \n");
242 } 242 }
243 pDevice->uChannel = sJoinCmd.uChannel; 243 pDevice->uChannel = sJoinCmd.uChannel;
244 netif_stop_queue(pDevice->dev); 244 netif_stop_queue(pDevice->dev);
@@ -251,7 +251,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
251 251
252 case WLAN_CMD_SET_WEP: 252 case WLAN_CMD_SET_WEP:
253 253
254 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_WEP Key. \n"); 254 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_WEP Key. \n");
255 memset(&sWEPCmd, 0 ,sizeof(SCmdSetWEP)); 255 memset(&sWEPCmd, 0 ,sizeof(SCmdSetWEP));
256 if (copy_from_user(&sWEPCmd, pReq->data, sizeof(SCmdSetWEP))) { 256 if (copy_from_user(&sWEPCmd, pReq->data, sizeof(SCmdSetWEP))) {
257 result = -EFAULT; 257 result = -EFAULT;
@@ -261,7 +261,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
261 pDevice->bEncryptionEnable = FALSE; 261 pDevice->bEncryptionEnable = FALSE;
262 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; 262 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
263 MACvDisableDefaultKey(pDevice->PortOffset); 263 MACvDisableDefaultKey(pDevice->PortOffset);
264 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WEP function disable. \n"); 264 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WEP function disable. \n");
265 break; 265 break;
266 } 266 }
267 267
@@ -293,7 +293,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
293 break; 293 break;
294 294
295 case WLAN_CMD_GET_LINK: 295 case WLAN_CMD_GET_LINK:
296 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_GET_LINK status. \n"); 296 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_GET_LINK status. \n");
297 297
298 memset(sLinkStatus.abySSID, 0 , WLAN_SSID_MAXLEN + 1); 298 memset(sLinkStatus.abySSID, 0 , WLAN_SSID_MAXLEN + 1);
299 299
@@ -314,7 +314,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
314 memcpy(sLinkStatus.abySSID, pItemSSID->abySSID, pItemSSID->len); 314 memcpy(sLinkStatus.abySSID, pItemSSID->abySSID, pItemSSID->len);
315 memcpy(sLinkStatus.abyBSSID, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN); 315 memcpy(sLinkStatus.abyBSSID, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
316 sLinkStatus.uLinkRate = pMgmt->sNodeDBTable[0].wTxDataRate; 316 sLinkStatus.uLinkRate = pMgmt->sNodeDBTable[0].wTxDataRate;
317 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Link Success ! \n"); 317 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Link Success ! \n");
318 } 318 }
319 else { 319 else {
320 sLinkStatus.bLink = FALSE; 320 sLinkStatus.bLink = FALSE;
@@ -409,7 +409,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
409 break; 409 break;
410 case WLAN_CMD_STOP_MAC: 410 case WLAN_CMD_STOP_MAC:
411 411
412 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_STOP_MAC\n"); 412 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_STOP_MAC\n");
413 netif_stop_queue(pDevice->dev); 413 netif_stop_queue(pDevice->dev);
414 414
415 spin_lock_irq(&pDevice->lock); 415 spin_lock_irq(&pDevice->lock);
@@ -430,7 +430,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
430 430
431 case WLAN_CMD_START_MAC: 431 case WLAN_CMD_START_MAC:
432 432
433 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_START_MAC\n"); 433 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_START_MAC\n");
434 434
435 if (pDevice->bMACSuspend == TRUE) { 435 if (pDevice->bMACSuspend == TRUE) {
436 if (pDevice->bRadioOff == TRUE) 436 if (pDevice->bRadioOff == TRUE)
@@ -444,7 +444,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
444 444
445 case WLAN_CMD_SET_HOSTAPD: 445 case WLAN_CMD_SET_HOSTAPD:
446 446
447 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOSTAPD\n"); 447 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOSTAPD\n");
448 448
449 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { 449 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
450 result = -EFAULT; 450 result = -EFAULT;
@@ -452,7 +452,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
452 }; 452 };
453 if (sValue.dwValue == 1) { 453 if (sValue.dwValue == 1) {
454 if (hostap_set_hostapd(pDevice, 1, 1) == 0){ 454 if (hostap_set_hostapd(pDevice, 1, 1) == 0){
455 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n"); 455 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n");
456 } 456 }
457 else { 457 else {
458 result = -EFAULT; 458 result = -EFAULT;
@@ -461,19 +461,19 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
461 } 461 }
462 else { 462 else {
463 hostap_set_hostapd(pDevice, 0, 1); 463 hostap_set_hostapd(pDevice, 0, 1);
464 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n"); 464 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HOSTAP\n");
465 } 465 }
466 466
467 break; 467 break;
468 468
469 case WLAN_CMD_SET_HOSTAPD_STA: 469 case WLAN_CMD_SET_HOSTAPD_STA:
470 470
471 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOSTAPD_STA\n"); 471 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOSTAPD_STA\n");
472 472
473 break; 473 break;
474 case WLAN_CMD_SET_802_1X: 474 case WLAN_CMD_SET_802_1X:
475 475
476 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_802_1X\n"); 476 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_802_1X\n");
477 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { 477 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
478 result = -EFAULT; 478 result = -EFAULT;
479 break; 479 break;
@@ -481,11 +481,11 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
481 481
482 if (sValue.dwValue == 1) { 482 if (sValue.dwValue == 1) {
483 pDevice->bEnable8021x = TRUE; 483 pDevice->bEnable8021x = TRUE;
484 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable 802.1x\n"); 484 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable 802.1x\n");
485 } 485 }
486 else { 486 else {
487 pDevice->bEnable8021x = FALSE; 487 pDevice->bEnable8021x = FALSE;
488 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable 802.1x\n"); 488 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable 802.1x\n");
489 } 489 }
490 490
491 break; 491 break;
@@ -493,7 +493,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
493 493
494 case WLAN_CMD_SET_HOST_WEP: 494 case WLAN_CMD_SET_HOST_WEP:
495 495
496 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOST_WEP\n"); 496 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_HOST_WEP\n");
497 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { 497 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
498 result = -EFAULT; 498 result = -EFAULT;
499 break; 499 break;
@@ -501,29 +501,29 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
501 501
502 if (sValue.dwValue == 1) { 502 if (sValue.dwValue == 1) {
503 pDevice->bEnableHostWEP = TRUE; 503 pDevice->bEnableHostWEP = TRUE;
504 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HostWEP\n"); 504 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HostWEP\n");
505 } 505 }
506 else { 506 else {
507 pDevice->bEnableHostWEP = FALSE; 507 pDevice->bEnableHostWEP = FALSE;
508 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HostWEP\n"); 508 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable HostWEP\n");
509 } 509 }
510 510
511 break; 511 break;
512 512
513 case WLAN_CMD_SET_WPA: 513 case WLAN_CMD_SET_WPA:
514 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_WPA\n"); 514 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_SET_WPA\n");
515 515
516 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { 516 if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) {
517 result = -EFAULT; 517 result = -EFAULT;
518 break; 518 break;
519 }; 519 };
520 if (sValue.dwValue == 1) { 520 if (sValue.dwValue == 1) {
521 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "up wpadev\n"); 521 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "up wpadev\n");
522 memcpy(pDevice->wpadev->dev_addr, pDevice->dev->dev_addr, U_ETHER_ADDR_LEN); 522 memcpy(pDevice->wpadev->dev_addr, pDevice->dev->dev_addr, U_ETHER_ADDR_LEN);
523 pDevice->bWPADEVUp = TRUE; 523 pDevice->bWPADEVUp = TRUE;
524 } 524 }
525 else { 525 else {
526 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "close wpadev\n"); 526 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "close wpadev\n");
527 pDevice->bWPADEVUp = FALSE; 527 pDevice->bWPADEVUp = FALSE;
528 } 528 }
529 529
@@ -531,7 +531,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
531 531
532 case WLAN_CMD_AP_START: 532 case WLAN_CMD_AP_START:
533 533
534 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_AP_START\n"); 534 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_AP_START\n");
535 if (pDevice->bRadioOff == TRUE) { 535 if (pDevice->bRadioOff == TRUE) {
536 CARDbRadioPowerOn(pDevice); 536 CARDbRadioPowerOn(pDevice);
537 vMgrTimerInit(pDevice); 537 vMgrTimerInit(pDevice);
@@ -545,10 +545,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
545 545
546 if (sStartAPCmd.wBSSType == AP) { 546 if (sStartAPCmd.wBSSType == AP) {
547 pMgmt->eConfigMode = WMAC_CONFIG_AP; 547 pMgmt->eConfigMode = WMAC_CONFIG_AP;
548 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to AP mode\n"); 548 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct set to AP mode\n");
549 } 549 }
550 else { 550 else {
551 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct BSS type not set to AP mode\n"); 551 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ioct BSS type not set to AP mode\n");
552 result = -EFAULT; 552 result = -EFAULT;
553 break; 553 break;
554 } 554 }
@@ -578,11 +578,11 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
578 578
579 if (sStartAPCmd.bShareKeyAuth == TRUE){ 579 if (sStartAPCmd.bShareKeyAuth == TRUE){
580 pMgmt->bShareKeyAlgorithm = TRUE; 580 pMgmt->bShareKeyAlgorithm = TRUE;
581 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key \n"); 581 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Share Key \n");
582 } 582 }
583 else { 583 else {
584 pMgmt->bShareKeyAlgorithm = FALSE; 584 pMgmt->bShareKeyAlgorithm = FALSE;
585 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System \n"); 585 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Open System \n");
586 } 586 }
587 memcpy(pMgmt->abyIBSSSuppRates, abySuppRates, 6); 587 memcpy(pMgmt->abyIBSSSuppRates, abySuppRates, 6);
588 588
@@ -606,7 +606,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
606 pMgmt->abyIBSSSuppRates[3] |= BIT7; 606 pMgmt->abyIBSSSuppRates[3] |= BIT7;
607 } 607 }
608 608
609 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Support Rate= %x %x %x %x\n", 609 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Support Rate= %x %x %x %x\n",
610 pMgmt->abyIBSSSuppRates[2], 610 pMgmt->abyIBSSSuppRates[2],
611 pMgmt->abyIBSSSuppRates[3], 611 pMgmt->abyIBSSSuppRates[3],
612 pMgmt->abyIBSSSuppRates[4], 612 pMgmt->abyIBSSSuppRates[4],
@@ -664,7 +664,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
664 pNodeList->sNodeList[jj].byKeyIndex = pNode->byKeyIndex; 664 pNodeList->sNodeList[jj].byKeyIndex = pNode->byKeyIndex;
665 pNodeList->sNodeList[jj].wWepKeyLength = pNode->uWepKeyLength; 665 pNodeList->sNodeList[jj].wWepKeyLength = pNode->uWepKeyLength;
666 memcpy(&(pNodeList->sNodeList[jj].abyWepKey[0]), &(pNode->abyWepKey[0]), WEP_KEYMAXLEN); 666 memcpy(&(pNodeList->sNodeList[jj].abyWepKey[0]), &(pNode->abyWepKey[0]), WEP_KEYMAXLEN);
667 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "key= %2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n", 667 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "key= %2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",
668 pNodeList->sNodeList[jj].abyWepKey[0], 668 pNodeList->sNodeList[jj].abyWepKey[0],
669 pNodeList->sNodeList[jj].abyWepKey[1], 669 pNodeList->sNodeList[jj].abyWepKey[1],
670 pNodeList->sNodeList[jj].abyWepKey[2], 670 pNodeList->sNodeList[jj].abyWepKey[2],
@@ -730,7 +730,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
730 730
731 731
732 default: 732 default:
733 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not support..\n"); 733 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not support..\n");
734 } 734 }
735 735
736 return result; 736 return result;
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 2ff8f243e49..e755ae711c2 100644
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -156,7 +156,7 @@ static int iwctl_commit(struct net_device *dev,
156 void *wrq, 156 void *wrq,
157 char *extra) 157 char *extra)
158{ 158{
159 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT \n"); 159 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT \n");
160 160
161 return 0; 161 return 0;
162 162
@@ -201,7 +201,7 @@ int iwctl_siwscan(struct net_device *dev,
201 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 201 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
202 BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 202 BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
203 PWLAN_IE_SSID pItemSSID=NULL; 203 PWLAN_IE_SSID pItemSSID=NULL;
204 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSCAN \n"); 204 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWSCAN \n");
205 205
206 206
207if(pDevice->byReAssocCount > 0) { //reject scan when re-associating! 207if(pDevice->byReAssocCount > 0) { //reject scan when re-associating!
@@ -276,7 +276,7 @@ int iwctl_giwscan(struct net_device *dev,
276 char buf[MAX_WPA_IE_LEN * 2 + 30]; 276 char buf[MAX_WPA_IE_LEN * 2 + 30];
277 277
278 278
279 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN \n"); 279 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN \n");
280 280
281 if (pMgmt->eScanState == WMAC_IS_SCANNING) { 281 if (pMgmt->eScanState == WMAC_IS_SCANNING) {
282 // In scanning.. 282 // In scanning..
@@ -423,7 +423,7 @@ int iwctl_siwfreq(struct net_device *dev,
423 PSDevice pDevice = (PSDevice)netdev_priv(dev); 423 PSDevice pDevice = (PSDevice)netdev_priv(dev);
424 int rc = 0; 424 int rc = 0;
425 425
426 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFREQ \n"); 426 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFREQ \n");
427 427
428 // If setting by frequency, convert to a channel 428 // If setting by frequency, convert to a channel
429 if((wrq->e == 1) && 429 if((wrq->e == 1) &&
@@ -442,11 +442,11 @@ int iwctl_siwfreq(struct net_device *dev,
442 else { 442 else {
443 int channel = wrq->m; 443 int channel = wrq->m;
444 if((channel < 1) || (channel > 14)) { 444 if((channel < 1) || (channel > 14)) {
445 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: New channel value of %d is invalid!\n", dev->name, wrq->m); 445 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: New channel value of %d is invalid!\n", dev->name, wrq->m);
446 rc = -EINVAL; 446 rc = -EINVAL;
447 } else { 447 } else {
448 // Yes ! We can set it !!! 448 // Yes ! We can set it !!!
449 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Set to channel = %d\n", channel); 449 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Set to channel = %d\n", channel);
450 pDevice->uChannel = channel; 450 pDevice->uChannel = channel;
451 //2007-0207-04,<Add> by EinsnLiu 451 //2007-0207-04,<Add> by EinsnLiu
452 //Make change effect at once 452 //Make change effect at once
@@ -469,7 +469,7 @@ int iwctl_giwfreq(struct net_device *dev,
469 PSDevice pDevice = (PSDevice)netdev_priv(dev); 469 PSDevice pDevice = (PSDevice)netdev_priv(dev);
470 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 470 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
471 471
472 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFREQ \n"); 472 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFREQ \n");
473 473
474#ifdef WEXT_USECHANNELS 474#ifdef WEXT_USECHANNELS
475 wrq->m = (int)pMgmt->uCurrChannel; 475 wrq->m = (int)pMgmt->uCurrChannel;
@@ -500,10 +500,10 @@ int iwctl_siwmode(struct net_device *dev,
500 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 500 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
501 int rc = 0; 501 int rc = 0;
502 502
503 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMODE \n"); 503 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWMODE \n");
504 504
505 if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP && pDevice->bEnableHostapd) { 505 if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP && pDevice->bEnableHostapd) {
506 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Can't set operation mode, hostapd is running \n"); 506 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Can't set operation mode, hostapd is running \n");
507 return rc; 507 return rc;
508 } 508 }
509 509
@@ -516,7 +516,7 @@ int iwctl_siwmode(struct net_device *dev,
516 pDevice->bCommit = TRUE; 516 pDevice->bCommit = TRUE;
517 } 517 }
518 } 518 }
519 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to ad-hoc \n"); 519 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to ad-hoc \n");
520 break; 520 break;
521 case IW_MODE_AUTO: 521 case IW_MODE_AUTO:
522 case IW_MODE_INFRA: 522 case IW_MODE_INFRA:
@@ -526,7 +526,7 @@ int iwctl_siwmode(struct net_device *dev,
526 pDevice->bCommit = TRUE; 526 pDevice->bCommit = TRUE;
527 } 527 }
528 } 528 }
529 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to infrastructure \n"); 529 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to infrastructure \n");
530 break; 530 break;
531 case IW_MODE_MASTER: 531 case IW_MODE_MASTER:
532 532
@@ -540,7 +540,7 @@ int iwctl_siwmode(struct net_device *dev,
540 pDevice->bCommit = TRUE; 540 pDevice->bCommit = TRUE;
541 } 541 }
542 } 542 }
543 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to Access Point \n"); 543 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set mode to Access Point \n");
544 break; 544 break;
545 545
546 case IW_MODE_REPEAT: 546 case IW_MODE_REPEAT:
@@ -567,7 +567,7 @@ int iwctl_giwmode(struct net_device *dev,
567 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 567 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
568 568
569 569
570 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWMODE \n"); 570 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWMODE \n");
571 // If not managed, assume it's ad-hoc 571 // If not managed, assume it's ad-hoc
572 switch (pMgmt->eConfigMode) { 572 switch (pMgmt->eConfigMode) {
573 case WMAC_CONFIG_ESS_STA: 573 case WMAC_CONFIG_ESS_STA:
@@ -604,7 +604,7 @@ int iwctl_giwrange(struct net_device *dev,
604 BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90}; 604 BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};
605 605
606 606
607 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE \n"); 607 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE \n");
608 if (wrq->pointer) { 608 if (wrq->pointer) {
609 wrq->length = sizeof(struct iw_range); 609 wrq->length = sizeof(struct iw_range);
610 memset(range, 0, sizeof(struct iw_range)); 610 memset(range, 0, sizeof(struct iw_range));
@@ -714,7 +714,7 @@ int iwctl_siwap(struct net_device *dev,
714 int rc = 0; 714 int rc = 0;
715 BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00}; 715 BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};
716 716
717 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAP \n"); 717 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAP \n");
718if (pMgmt->eScanState == WMAC_IS_SCANNING) { 718if (pMgmt->eScanState == WMAC_IS_SCANNING) {
719 // In scanning.. 719 // In scanning..
720 printk("SIOCSIWAP(??)-->In scanning...\n"); 720 printk("SIOCSIWAP(??)-->In scanning...\n");
@@ -771,7 +771,7 @@ int iwctl_giwap(struct net_device *dev,
771 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 771 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
772 772
773 773
774 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAP \n"); 774 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAP \n");
775 775
776 memcpy(wrq->sa_data, pMgmt->abyCurrBSSID, 6); 776 memcpy(wrq->sa_data, pMgmt->abyCurrBSSID, 6);
777 //2008-0410,<Modify> by Einsn Liu 777 //2008-0410,<Modify> by Einsn Liu
@@ -805,7 +805,7 @@ int iwctl_giwaplist(struct net_device *dev,
805 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 805 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
806 806
807 807
808 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAPLIST \n"); 808 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWAPLIST \n");
809 // Only super-user can see AP list 809 // Only super-user can see AP list
810 810
811 if (!capable(CAP_NET_ADMIN)) { 811 if (!capable(CAP_NET_ADMIN)) {
@@ -857,7 +857,7 @@ int iwctl_siwessid(struct net_device *dev,
857 BYTE len; 857 BYTE len;
858 858
859 859
860 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWESSID \n"); 860 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWESSID \n");
861 pDevice->fWPA_Authened = FALSE; 861 pDevice->fWPA_Authened = FALSE;
862if (pMgmt->eScanState == WMAC_IS_SCANNING) { 862if (pMgmt->eScanState == WMAC_IS_SCANNING) {
863 // In scanning.. 863 // In scanning..
@@ -948,9 +948,9 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
948 } 948 }
949 #endif 949 #endif
950 950
951 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set essid = %s \n", pItemSSID->abySSID); 951 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "set essid = %s \n", pItemSSID->abySSID);
952/* 952/*
953 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO " SIOCSIWESSID2 \n"); 953 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " SIOCSIWESSID2 \n");
954 pItemSSID->len = wrq->length; 954 pItemSSID->len = wrq->length;
955 */ 955 */
956 } 956 }
@@ -978,7 +978,7 @@ int iwctl_giwessid(struct net_device *dev,
978 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 978 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
979 PWLAN_IE_SSID pItemSSID; 979 PWLAN_IE_SSID pItemSSID;
980 980
981 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWESSID \n"); 981 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWESSID \n");
982 982
983 // Note : if wrq->u.data.flags != 0, we should 983 // Note : if wrq->u.data.flags != 0, we should
984 // get the relevant SSID from the SSID list... 984 // get the relevant SSID from the SSID list...
@@ -1013,7 +1013,7 @@ int iwctl_siwrate(struct net_device *dev,
1013 BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90}; 1013 BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};
1014 1014
1015 1015
1016 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRATE \n"); 1016 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRATE \n");
1017 if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) { 1017 if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
1018 rc = -EINVAL; 1018 rc = -EINVAL;
1019 return rc; 1019 return rc;
@@ -1069,7 +1069,7 @@ int iwctl_siwrate(struct net_device *dev,
1069 } 1069 }
1070 else { 1070 else {
1071 pDevice->uConnectionRate = brate; 1071 pDevice->uConnectionRate = brate;
1072 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Fixed to Rate %d \n", pDevice->uConnectionRate); 1072 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Fixed to Rate %d \n", pDevice->uConnectionRate);
1073 } 1073 }
1074 1074
1075 } 1075 }
@@ -1096,7 +1096,7 @@ int iwctl_giwrate(struct net_device *dev,
1096//Mark the unnecessary sentences. 1096//Mark the unnecessary sentences.
1097// PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1097// PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1098 1098
1099 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRATE \n"); 1099 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRATE \n");
1100 { 1100 {
1101 BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90}; 1101 BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};
1102 int brate = 0; 1102 int brate = 0;
@@ -1160,7 +1160,7 @@ int iwctl_siwrts(struct net_device *dev,
1160 PSDevice pDevice = (PSDevice)netdev_priv(dev); 1160 PSDevice pDevice = (PSDevice)netdev_priv(dev);
1161 int rc = 0; 1161 int rc = 0;
1162 1162
1163 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRTS \n"); 1163 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRTS \n");
1164 1164
1165 { 1165 {
1166 int rthr = wrq->value; 1166 int rthr = wrq->value;
@@ -1187,7 +1187,7 @@ int iwctl_giwrts(struct net_device *dev,
1187{ 1187{
1188 PSDevice pDevice = (PSDevice)netdev_priv(dev); 1188 PSDevice pDevice = (PSDevice)netdev_priv(dev);
1189 1189
1190 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRTS \n"); 1190 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRTS \n");
1191 wrq->value = pDevice->wRTSThreshold; 1191 wrq->value = pDevice->wRTSThreshold;
1192 wrq->disabled = (wrq->value >= 2312); 1192 wrq->disabled = (wrq->value >= 2312);
1193 wrq->fixed = 1; 1193 wrq->fixed = 1;
@@ -1209,7 +1209,7 @@ int iwctl_siwfrag(struct net_device *dev,
1209 int fthr = wrq->value; 1209 int fthr = wrq->value;
1210 1210
1211 1211
1212 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFRAG \n"); 1212 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWFRAG \n");
1213 1213
1214 1214
1215 if (wrq->disabled) 1215 if (wrq->disabled)
@@ -1235,7 +1235,7 @@ int iwctl_giwfrag(struct net_device *dev,
1235{ 1235{
1236 PSDevice pDevice = (PSDevice)netdev_priv(dev); 1236 PSDevice pDevice = (PSDevice)netdev_priv(dev);
1237 1237
1238 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFRAG \n"); 1238 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWFRAG \n");
1239 wrq->value = pDevice->wFragmentationThreshold; 1239 wrq->value = pDevice->wFragmentationThreshold;
1240 wrq->disabled = (wrq->value >= 2312); 1240 wrq->disabled = (wrq->value >= 2312);
1241 wrq->fixed = 1; 1241 wrq->fixed = 1;
@@ -1257,7 +1257,7 @@ int iwctl_siwretry(struct net_device *dev,
1257 int rc = 0; 1257 int rc = 0;
1258 1258
1259 1259
1260 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRETRY \n"); 1260 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWRETRY \n");
1261 1261
1262 if (wrq->disabled) { 1262 if (wrq->disabled) {
1263 rc = -EINVAL; 1263 rc = -EINVAL;
@@ -1292,7 +1292,7 @@ int iwctl_giwretry(struct net_device *dev,
1292 char *extra) 1292 char *extra)
1293{ 1293{
1294 PSDevice pDevice = (PSDevice)netdev_priv(dev); 1294 PSDevice pDevice = (PSDevice)netdev_priv(dev);
1295 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRETRY \n"); 1295 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRETRY \n");
1296 wrq->disabled = 0; // Can't be disabled 1296 wrq->disabled = 0; // Can't be disabled
1297 1297
1298 // Note : by default, display the min retry number 1298 // Note : by default, display the min retry number
@@ -1339,7 +1339,7 @@ int iwctl_siwencode(struct net_device *dev,
1339 1339
1340 PSKeyTable pkeytab; 1340 PSKeyTable pkeytab;
1341 1341
1342 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODE \n"); 1342 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODE \n");
1343 1343
1344if((wrq->flags & IW_ENCODE_DISABLED)==0){ 1344if((wrq->flags & IW_ENCODE_DISABLED)==0){
1345 //Not disable encryption 1345 //Not disable encryption
@@ -1366,13 +1366,13 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1366 if(wrq->length>0){//have key 1366 if(wrq->length>0){//have key
1367 1367
1368 if (wrq->length == WLAN_WEP232_KEYLEN) { 1368 if (wrq->length == WLAN_WEP232_KEYLEN) {
1369 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 232 bit wep key\n"); 1369 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 232 bit wep key\n");
1370 } 1370 }
1371 else if (wrq->length == WLAN_WEP104_KEYLEN) { 1371 else if (wrq->length == WLAN_WEP104_KEYLEN) {
1372 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 104 bit wep key\n"); 1372 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 104 bit wep key\n");
1373 } 1373 }
1374 else if (wrq->length == WLAN_WEP40_KEYLEN) { 1374 else if (wrq->length == WLAN_WEP40_KEYLEN) {
1375 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 40 bit wep key, index= %d\n", (int)dwKeyIndex); 1375 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 40 bit wep key, index= %d\n", (int)dwKeyIndex);
1376 }else {//no support length 1376 }else {//no support length
1377 rc = -EINVAL; 1377 rc = -EINVAL;
1378 return rc; 1378 return rc;
@@ -1380,9 +1380,9 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1380 memset(pDevice->abyKey, 0, WLAN_WEP232_KEYLEN); 1380 memset(pDevice->abyKey, 0, WLAN_WEP232_KEYLEN);
1381 memcpy(pDevice->abyKey, extra, wrq->length); 1381 memcpy(pDevice->abyKey, extra, wrq->length);
1382 1382
1383 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyKey: "); 1383 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyKey: ");
1384 for (ii = 0; ii < wrq->length; ii++) { 1384 for (ii = 0; ii < wrq->length; ii++) {
1385 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pDevice->abyKey[ii]); 1385 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pDevice->abyKey[ii]);
1386 } 1386 }
1387 1387
1388 if (pDevice->flags & DEVICE_FLAGS_OPENED) { 1388 if (pDevice->flags & DEVICE_FLAGS_OPENED) {
@@ -1412,10 +1412,10 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1412 rc = -EINVAL; 1412 rc = -EINVAL;
1413 return rc; 1413 return rc;
1414 } 1414 }
1415 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Just set Default key Index:\n"); 1415 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Just set Default key Index:\n");
1416 pkeytab=&(pDevice->sKey.KeyTable[MAX_KEY_TABLE-1]); 1416 pkeytab=&(pDevice->sKey.KeyTable[MAX_KEY_TABLE-1]);
1417 if(pkeytab->GroupKey[(BYTE)dwKeyIndex].uKeyLength==0){ 1417 if(pkeytab->GroupKey[(BYTE)dwKeyIndex].uKeyLength==0){
1418 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Default key len is 0\n"); 1418 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Default key len is 0\n");
1419 rc = -EINVAL; 1419 rc = -EINVAL;
1420 return rc; 1420 return rc;
1421 } 1421 }
@@ -1425,7 +1425,7 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1425 } 1425 }
1426 1426
1427}else {//disable the key 1427}else {//disable the key
1428 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable WEP function\n"); 1428 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable WEP function\n");
1429 if(pDevice->bEncryptionEnable==FALSE) 1429 if(pDevice->bEncryptionEnable==FALSE)
1430 return 0; 1430 return 0;
1431 pMgmt->bShareKeyAlgorithm = FALSE; 1431 pMgmt->bShareKeyAlgorithm = FALSE;
@@ -1441,7 +1441,7 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1441//End Modify,Einsn 1441//End Modify,Einsn
1442 1442
1443/* 1443/*
1444 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODE \n"); 1444 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWENCODE \n");
1445 1445
1446 // Check the size of the key 1446 // Check the size of the key
1447 if (wrq->length > WLAN_WEP232_KEYLEN) { 1447 if (wrq->length > WLAN_WEP232_KEYLEN) {
@@ -1461,20 +1461,20 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1461 if (wrq->length > 0) { 1461 if (wrq->length > 0) {
1462 1462
1463 if (wrq->length == WLAN_WEP232_KEYLEN) { 1463 if (wrq->length == WLAN_WEP232_KEYLEN) {
1464 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 232 bit wep key\n"); 1464 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 232 bit wep key\n");
1465 } 1465 }
1466 else if (wrq->length == WLAN_WEP104_KEYLEN) { 1466 else if (wrq->length == WLAN_WEP104_KEYLEN) {
1467 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 104 bit wep key\n"); 1467 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 104 bit wep key\n");
1468 } 1468 }
1469 else if (wrq->length == WLAN_WEP40_KEYLEN) { 1469 else if (wrq->length == WLAN_WEP40_KEYLEN) {
1470 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 40 bit wep key, index= %d\n", (int)dwKeyIndex); 1470 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Set 40 bit wep key, index= %d\n", (int)dwKeyIndex);
1471 } 1471 }
1472 memset(pDevice->abyKey, 0, WLAN_WEP232_KEYLEN); 1472 memset(pDevice->abyKey, 0, WLAN_WEP232_KEYLEN);
1473 memcpy(pDevice->abyKey, extra, wrq->length); 1473 memcpy(pDevice->abyKey, extra, wrq->length);
1474 1474
1475 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyKey: "); 1475 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyKey: ");
1476 for (ii = 0; ii < wrq->length; ii++) { 1476 for (ii = 0; ii < wrq->length; ii++) {
1477 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pDevice->abyKey[ii]); 1477 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pDevice->abyKey[ii]);
1478 } 1478 }
1479 1479
1480 if (pDevice->flags & DEVICE_FLAGS_OPENED) { 1480 if (pDevice->flags & DEVICE_FLAGS_OPENED) {
@@ -1508,7 +1508,7 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1508 // Read the flags 1508 // Read the flags
1509 if(wrq->flags & IW_ENCODE_DISABLED){ 1509 if(wrq->flags & IW_ENCODE_DISABLED){
1510 1510
1511 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable WEP function\n"); 1511 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disable WEP function\n");
1512 pMgmt->bShareKeyAlgorithm = FALSE; 1512 pMgmt->bShareKeyAlgorithm = FALSE;
1513 pDevice->bEncryptionEnable = FALSE; 1513 pDevice->bEncryptionEnable = FALSE;
1514 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; 1514 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
@@ -1522,11 +1522,11 @@ if((wrq->flags & IW_ENCODE_DISABLED)==0){
1522*/ 1522*/
1523 1523
1524 if(wrq->flags & IW_ENCODE_RESTRICTED) { 1524 if(wrq->flags & IW_ENCODE_RESTRICTED) {
1525 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable WEP & ShareKey System\n"); 1525 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable WEP & ShareKey System\n");
1526 pMgmt->bShareKeyAlgorithm = TRUE; 1526 pMgmt->bShareKeyAlgorithm = TRUE;
1527 } 1527 }
1528 if(wrq->flags & IW_ENCODE_OPEN) { 1528 if(wrq->flags & IW_ENCODE_OPEN) {
1529 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable WEP & Open System\n"); 1529 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable WEP & Open System\n");
1530 pMgmt->bShareKeyAlgorithm = FALSE; 1530 pMgmt->bShareKeyAlgorithm = FALSE;
1531 } 1531 }
1532 return rc; 1532 return rc;
@@ -1548,7 +1548,7 @@ int iwctl_giwencode(struct net_device *dev,
1548 UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX); 1548 UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX);
1549 PSKeyItem pKey = NULL; 1549 PSKeyItem pKey = NULL;
1550 1550
1551 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n"); 1551 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");
1552//2007-0207-06,<Add> by EinsnLiu 1552//2007-0207-06,<Add> by EinsnLiu
1553//the key index in iwconfig is 1-4 when our driver is 0-3 1553//the key index in iwconfig is 1-4 when our driver is 0-3
1554//so it can't be used directly. 1554//so it can't be used directly.
@@ -1617,7 +1617,7 @@ int iwctl_giwencode(struct net_device *dev,
1617 UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX); 1617 UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX);
1618 PSKeyItem pKey = NULL; 1618 PSKeyItem pKey = NULL;
1619 1619
1620 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n"); 1620 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");
1621 1621
1622 if (index > WLAN_WEP_NKEYS) { 1622 if (index > WLAN_WEP_NKEYS) {
1623 return -EINVAL; 1623 return -EINVAL;
@@ -1675,7 +1675,7 @@ int iwctl_siwpower(struct net_device *dev,
1675 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1675 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1676 int rc = 0; 1676 int rc = 0;
1677 1677
1678 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER \n"); 1678 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER \n");
1679 1679
1680 if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) { 1680 if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) {
1681 rc = -EINVAL; 1681 rc = -EINVAL;
@@ -1697,14 +1697,14 @@ int iwctl_siwpower(struct net_device *dev,
1697 } 1697 }
1698 switch (wrq->flags & IW_POWER_MODE) { 1698 switch (wrq->flags & IW_POWER_MODE) {
1699 case IW_POWER_UNICAST_R: 1699 case IW_POWER_UNICAST_R:
1700 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER: IW_POWER_UNICAST_R \n"); 1700 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER: IW_POWER_UNICAST_R \n");
1701 rc = -EINVAL; 1701 rc = -EINVAL;
1702 break; 1702 break;
1703 case IW_POWER_ALL_R: 1703 case IW_POWER_ALL_R:
1704 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER: IW_POWER_ALL_R \n"); 1704 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER: IW_POWER_ALL_R \n");
1705 rc = -EINVAL; 1705 rc = -EINVAL;
1706 case IW_POWER_ON: 1706 case IW_POWER_ON:
1707 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER: IW_POWER_ON \n"); 1707 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWPOWER: IW_POWER_ON \n");
1708 break; 1708 break;
1709 default: 1709 default:
1710 rc = -EINVAL; 1710 rc = -EINVAL;
@@ -1726,7 +1726,7 @@ int iwctl_giwpower(struct net_device *dev,
1726 int mode = pDevice->ePSMode; 1726 int mode = pDevice->ePSMode;
1727 1727
1728 1728
1729 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPOWER \n"); 1729 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWPOWER \n");
1730 1730
1731 1731
1732 if ((wrq->disabled = (mode == WMAC_POWER_CAM))) 1732 if ((wrq->disabled = (mode == WMAC_POWER_CAM)))
@@ -1756,7 +1756,7 @@ int iwctl_giwsens(struct net_device *dev,
1756 PSDevice pDevice = (PSDevice)netdev_priv(dev); 1756 PSDevice pDevice = (PSDevice)netdev_priv(dev);
1757 long ldBm; 1757 long ldBm;
1758 1758
1759 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSENS \n"); 1759 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSENS \n");
1760 if (pDevice->bLinkPass == TRUE) { 1760 if (pDevice->bLinkPass == TRUE) {
1761 RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm); 1761 RFvRSSITodBm(pDevice, (BYTE)(pDevice->uCurrRSSI), &ldBm);
1762 wrq->value = ldBm; 1762 wrq->value = ldBm;
@@ -1785,7 +1785,7 @@ int iwctl_siwauth(struct net_device *dev,
1785 static int wpa_version=0; //must be static to save the last value,einsn liu 1785 static int wpa_version=0; //must be static to save the last value,einsn liu
1786 static int pairwise=0; 1786 static int pairwise=0;
1787 1787
1788 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH \n"); 1788 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH \n");
1789 switch (wrq->flags & IW_AUTH_INDEX) { 1789 switch (wrq->flags & IW_AUTH_INDEX) {
1790 case IW_AUTH_WPA_VERSION: 1790 case IW_AUTH_WPA_VERSION:
1791 wpa_version = wrq->value; 1791 wpa_version = wrq->value;
@@ -1877,13 +1877,13 @@ int iwctl_siwauth(struct net_device *dev,
1877 break; 1877 break;
1878 } 1878 }
1879/* 1879/*
1880 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_version = %d\n",wpa_version); 1880 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_version = %d\n",wpa_version);
1881 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise = %d\n",pairwise); 1881 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise = %d\n",pairwise);
1882 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->eEncryptionStatus = %d\n",pDevice->eEncryptionStatus); 1882 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->eEncryptionStatus = %d\n",pDevice->eEncryptionStatus);
1883 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->eAuthenMode = %d\n",pMgmt->eAuthenMode); 1883 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->eAuthenMode = %d\n",pMgmt->eAuthenMode);
1884 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->bShareKeyAlgorithm = %s\n",pMgmt->bShareKeyAlgorithm?"TRUE":"FALSE"); 1884 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pMgmt->bShareKeyAlgorithm = %s\n",pMgmt->bShareKeyAlgorithm?"TRUE":"FALSE");
1885 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bEncryptionEnable = %s\n",pDevice->bEncryptionEnable?"TRUE":"FALSE"); 1885 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bEncryptionEnable = %s\n",pDevice->bEncryptionEnable?"TRUE":"FALSE");
1886 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bWPADevEnable = %s\n",pDevice->bWPADevEnable?"TRUE":"FALSE"); 1886 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pDevice->bWPADevEnable = %s\n",pDevice->bWPADevEnable?"TRUE":"FALSE");
1887*/ 1887*/
1888 return ret; 1888 return ret;
1889} 1889}
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index 168ebd3be94..28fea235251 100644
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -153,7 +153,7 @@ BOOL KeybGetKey (
153{ 153{
154 int i; 154 int i;
155 155
156 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybGetKey() \n"); 156 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybGetKey() \n");
157 157
158 *pKey = NULL; 158 *pKey = NULL;
159 for (i=0;i<MAX_KEY_TABLE;i++) { 159 for (i=0;i<MAX_KEY_TABLE;i++) {
@@ -219,7 +219,7 @@ BOOL KeybSetKey (
219 PSKeyItem pKey; 219 PSKeyItem pKey;
220 UINT uKeyIdx; 220 UINT uKeyIdx;
221 221
222 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex); 222 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
223 223
224 j = (MAX_KEY_TABLE-1); 224 j = (MAX_KEY_TABLE-1);
225 for (i=0;i<(MAX_KEY_TABLE-1);i++) { 225 for (i=0;i<(MAX_KEY_TABLE-1);i++) {
@@ -245,7 +245,7 @@ BOOL KeybSetKey (
245 if ((dwKeyIndex & TRANSMIT_KEY) != 0) { 245 if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
246 // Group transmit key 246 // Group transmit key
247 pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex; 247 pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
248 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i); 248 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
249 } 249 }
250 pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed 250 pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed
251 pTable->KeyTable[i].wKeyCtl |= (byKeyDecMode << 4); 251 pTable->KeyTable[i].wKeyCtl |= (byKeyDecMode << 4);
@@ -277,18 +277,18 @@ BOOL KeybSetKey (
277 pKey->dwTSC47_16 = 0; 277 pKey->dwTSC47_16 = 0;
278 pKey->wTSC15_0 = 0; 278 pKey->wTSC15_0 = 0;
279 279
280 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(R): \n"); 280 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(R): \n");
281 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n ", pKey->bKeyValid); 281 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n ", pKey->bKeyValid);
282 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n ", pKey->uKeyLength); 282 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n ", pKey->uKeyLength);
283 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: "); 283 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: ");
284 for (ii = 0; ii < pKey->uKeyLength; ii++) { 284 for (ii = 0; ii < pKey->uKeyLength; ii++) {
285 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pKey->abyKey[ii]); 285 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pKey->abyKey[ii]);
286 } 286 }
287 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 287 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
288 288
289 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16); 289 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
290 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0); 290 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
291 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex); 291 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
292 292
293 return (TRUE); 293 return (TRUE);
294 } 294 }
@@ -310,7 +310,7 @@ BOOL KeybSetKey (
310 if ((dwKeyIndex & TRANSMIT_KEY) != 0) { 310 if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
311 // Group transmit key 311 // Group transmit key
312 pTable->KeyTable[j].dwGTKeyIndex = dwKeyIndex; 312 pTable->KeyTable[j].dwGTKeyIndex = dwKeyIndex;
313 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(N)[%lX]: %d\n", pTable->KeyTable[j].dwGTKeyIndex, j); 313 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(N)[%lX]: %d\n", pTable->KeyTable[j].dwGTKeyIndex, j);
314 } 314 }
315 pTable->KeyTable[j].wKeyCtl &= 0xFF0F; // clear group key control filed 315 pTable->KeyTable[j].wKeyCtl &= 0xFF0F; // clear group key control filed
316 pTable->KeyTable[j].wKeyCtl |= (byKeyDecMode << 4); 316 pTable->KeyTable[j].wKeyCtl |= (byKeyDecMode << 4);
@@ -342,18 +342,18 @@ BOOL KeybSetKey (
342 pKey->dwTSC47_16 = 0; 342 pKey->dwTSC47_16 = 0;
343 pKey->wTSC15_0 = 0; 343 pKey->wTSC15_0 = 0;
344 344
345 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(N): \n"); 345 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(N): \n");
346 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n ", pKey->bKeyValid); 346 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n ", pKey->bKeyValid);
347 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n ", (int)pKey->uKeyLength); 347 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n ", (int)pKey->uKeyLength);
348 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: "); 348 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: ");
349 for (ii = 0; ii < pKey->uKeyLength; ii++) { 349 for (ii = 0; ii < pKey->uKeyLength; ii++) {
350 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pKey->abyKey[ii]); 350 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%02x ", pKey->abyKey[ii]);
351 } 351 }
352 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 352 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
353 353
354 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16); 354 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n ", pKey->dwTSC47_16);
355 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0); 355 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n ", pKey->wTSC15_0);
356 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex); 356 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n ", pKey->dwKeyIndex);
357 357
358 return (TRUE); 358 return (TRUE);
359 } 359 }
@@ -549,51 +549,51 @@ BOOL KeybGetTransmitKey (
549 if (pTable->KeyTable[i].PairwiseKey.bKeyValid == TRUE) { 549 if (pTable->KeyTable[i].PairwiseKey.bKeyValid == TRUE) {
550 *pKey = &(pTable->KeyTable[i].PairwiseKey); 550 *pKey = &(pTable->KeyTable[i].PairwiseKey);
551 551
552 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybGetTransmitKey:"); 552 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybGetTransmitKey:");
553 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PAIRWISE_KEY: KeyTable.abyBSSID: "); 553 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PAIRWISE_KEY: KeyTable.abyBSSID: ");
554 for (ii = 0; ii < 6; ii++) { 554 for (ii = 0; ii < 6; ii++) {
555 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]); 555 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]);
556 } 556 }
557 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 557 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
558 558
559 559
560 return (TRUE); 560 return (TRUE);
561 } 561 }
562 else { 562 else {
563 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PairwiseKey.bKeyValid == FALSE\n"); 563 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"PairwiseKey.bKeyValid == FALSE\n");
564 return (FALSE); 564 return (FALSE);
565 } 565 }
566 } // End of Type == PAIRWISE 566 } // End of Type == PAIRWISE
567 else { 567 else {
568 if (pTable->KeyTable[i].dwGTKeyIndex == 0) { 568 if (pTable->KeyTable[i].dwGTKeyIndex == 0) {
569 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ERROR: dwGTKeyIndex == 0 !!!\n"); 569 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ERROR: dwGTKeyIndex == 0 !!!\n");
570 return FALSE; 570 return FALSE;
571 } 571 }
572 if (pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)].bKeyValid == TRUE) { 572 if (pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)].bKeyValid == TRUE) {
573 *pKey = &(pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)]); 573 *pKey = &(pTable->KeyTable[i].GroupKey[(pTable->KeyTable[i].dwGTKeyIndex&0x000000FF)]);
574 574
575 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybGetTransmitKey:"); 575 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybGetTransmitKey:");
576 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GROUP_KEY: KeyTable.abyBSSID\n"); 576 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GROUP_KEY: KeyTable.abyBSSID\n");
577 for (ii = 0; ii < 6; ii++) { 577 for (ii = 0; ii < 6; ii++) {
578 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]); 578 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x ", pTable->KeyTable[i].abyBSSID[ii]);
579 } 579 }
580 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 580 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
581 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %lX\n", pTable->KeyTable[i].dwGTKeyIndex); 581 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"dwGTKeyIndex: %lX\n", pTable->KeyTable[i].dwGTKeyIndex);
582 582
583 return (TRUE); 583 return (TRUE);
584 } 584 }
585 else { 585 else {
586 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GroupKey.bKeyValid == FALSE\n"); 586 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GroupKey.bKeyValid == FALSE\n");
587 return (FALSE); 587 return (FALSE);
588 } 588 }
589 } // End of Type = GROUP 589 } // End of Type = GROUP
590 } // BSSID match 590 } // BSSID match
591 } 591 }
592 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ERROR: NO Match BSSID !!! "); 592 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ERROR: NO Match BSSID !!! ");
593 for (ii = 0; ii < 6; ii++) { 593 for (ii = 0; ii < 6; ii++) {
594 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *(pbyBSSID+ii)); 594 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *(pbyBSSID+ii));
595 } 595 }
596 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 596 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
597 return (FALSE); 597 return (FALSE);
598} 598}
599 599
@@ -659,7 +659,7 @@ BOOL KeybSetDefaultKey (
659 PSKeyItem pKey; 659 PSKeyItem pKey;
660 UINT uKeyIdx; 660 UINT uKeyIdx;
661 661
662 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetDefaultKey: %1x, %d \n", (int)dwKeyIndex, (int)uKeyLength); 662 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetDefaultKey: %1x, %d \n", (int)dwKeyIndex, (int)uKeyLength);
663 663
664 664
665 if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key 665 if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
@@ -677,7 +677,7 @@ BOOL KeybSetDefaultKey (
677 if ((dwKeyIndex & TRANSMIT_KEY) != 0) { 677 if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
678 // Group transmit key 678 // Group transmit key
679 pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = dwKeyIndex; 679 pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex = dwKeyIndex;
680 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex, MAX_KEY_TABLE-1); 680 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[MAX_KEY_TABLE-1].dwGTKeyIndex, MAX_KEY_TABLE-1);
681 681
682 } 682 }
683 pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl &= 0x7F00; // clear all key control filed 683 pTable->KeyTable[MAX_KEY_TABLE-1].wKeyCtl &= 0x7F00; // clear all key control filed
@@ -718,18 +718,18 @@ BOOL KeybSetDefaultKey (
718 pKey->wTSC15_0 = 0; 718 pKey->wTSC15_0 = 0;
719 719
720 720
721 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(R): \n"); 721 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(R): \n");
722 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n", pKey->bKeyValid); 722 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n", pKey->bKeyValid);
723 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n", (int)pKey->uKeyLength); 723 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n", (int)pKey->uKeyLength);
724 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: \n"); 724 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: \n");
725 for (ii = 0; ii < pKey->uKeyLength; ii++) { 725 for (ii = 0; ii < pKey->uKeyLength; ii++) {
726 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x", pKey->abyKey[ii]); 726 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%x", pKey->abyKey[ii]);
727 } 727 }
728 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 728 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
729 729
730 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n", pKey->dwTSC47_16); 730 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwTSC47_16: %lx\n", pKey->dwTSC47_16);
731 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n", pKey->wTSC15_0); 731 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->wTSC15_0: %x\n", pKey->wTSC15_0);
732 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n", pKey->dwKeyIndex); 732 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->dwKeyIndex: %lx\n", pKey->dwKeyIndex);
733 733
734 return (TRUE); 734 return (TRUE);
735} 735}
@@ -767,7 +767,7 @@ BOOL KeybSetAllGroupKey (
767 PSKeyItem pKey; 767 PSKeyItem pKey;
768 UINT uKeyIdx; 768 UINT uKeyIdx;
769 769
770 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex); 770 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
771 771
772 772
773 if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key 773 if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
@@ -784,7 +784,7 @@ BOOL KeybSetAllGroupKey (
784 if ((dwKeyIndex & TRANSMIT_KEY) != 0) { 784 if ((dwKeyIndex & TRANSMIT_KEY) != 0) {
785 // Group transmit key 785 // Group transmit key
786 pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex; 786 pTable->KeyTable[i].dwGTKeyIndex = dwKeyIndex;
787 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i); 787 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Group transmit key(R)[%lX]: %d\n", pTable->KeyTable[i].dwGTKeyIndex, i);
788 788
789 } 789 }
790 pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed 790 pTable->KeyTable[i].wKeyCtl &= 0xFF0F; // clear group key control filed
@@ -817,14 +817,14 @@ BOOL KeybSetAllGroupKey (
817 pKey->dwTSC47_16 = 0; 817 pKey->dwTSC47_16 = 0;
818 pKey->wTSC15_0 = 0; 818 pKey->wTSC15_0 = 0;
819 819
820 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(R): \n"); 820 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KeybSetKey(R): \n");
821 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n ", pKey->bKeyValid); 821 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->bKeyValid: %d\n ", pKey->bKeyValid);
822 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n ", (int)pKey->uKeyLength); 822 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->uKeyLength: %d\n ", (int)pKey->uKeyLength);
823 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: "); 823 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"pKey->abyKey: ");
824 for (ii = 0; ii < pKey->uKeyLength; ii++) { 824 for (ii = 0; ii < pKey->uKeyLength; ii++) {
825 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", pKey->abyKey[ii]); 825 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", pKey->abyKey[ii]);
826 } 826 }
827 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 827 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
828 828
829 //DBG_PRN_GRP12(("pKey->dwTSC47_16: %lX\n ", pKey->dwTSC47_16)); 829 //DBG_PRN_GRP12(("pKey->dwTSC47_16: %lX\n ", pKey->dwTSC47_16));
830 //DBG_PRN_GRP12(("pKey->wTSC15_0: %X\n ", pKey->wTSC15_0)); 830 //DBG_PRN_GRP12(("pKey->wTSC15_0: %X\n ", pKey->wTSC15_0));
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index 0283ed3bedd..da997541b21 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -862,7 +862,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase)
862 } 862 }
863 if (ww == W_MAX_TIMEOUT) { 863 if (ww == W_MAX_TIMEOUT) {
864 DBG_PORT80(0x10); 864 DBG_PORT80(0x10);
865 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x10)\n"); 865 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x10)\n");
866 return(FALSE); 866 return(FALSE);
867 } 867 }
868 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { 868 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
@@ -872,7 +872,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase)
872 } 872 }
873 if (ww == W_MAX_TIMEOUT) { 873 if (ww == W_MAX_TIMEOUT) {
874 DBG_PORT80(0x11); 874 DBG_PORT80(0x11);
875 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x11)\n"); 875 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x11)\n");
876 return(FALSE); 876 return(FALSE);
877 } 877 }
878 878
@@ -886,7 +886,7 @@ BOOL MACbSafeRxOff (DWORD_PTR dwIoBase)
886 } 886 }
887 if (ww == W_MAX_TIMEOUT) { 887 if (ww == W_MAX_TIMEOUT) {
888 DBG_PORT80(0x12); 888 DBG_PORT80(0x12);
889 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x12)\n"); 889 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x12)\n");
890 return(FALSE); 890 return(FALSE);
891 } 891 }
892 return TRUE; 892 return TRUE;
@@ -925,7 +925,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase)
925 } 925 }
926 if (ww == W_MAX_TIMEOUT) { 926 if (ww == W_MAX_TIMEOUT) {
927 DBG_PORT80(0x20); 927 DBG_PORT80(0x20);
928 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x20)\n"); 928 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x20)\n");
929 return(FALSE); 929 return(FALSE);
930 } 930 }
931 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { 931 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) {
@@ -935,7 +935,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase)
935 } 935 }
936 if (ww == W_MAX_TIMEOUT) { 936 if (ww == W_MAX_TIMEOUT) {
937 DBG_PORT80(0x21); 937 DBG_PORT80(0x21);
938 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x21)\n"); 938 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x21)\n");
939 return(FALSE); 939 return(FALSE);
940 } 940 }
941 941
@@ -950,7 +950,7 @@ BOOL MACbSafeTxOff (DWORD_PTR dwIoBase)
950 } 950 }
951 if (ww == W_MAX_TIMEOUT) { 951 if (ww == W_MAX_TIMEOUT) {
952 DBG_PORT80(0x24); 952 DBG_PORT80(0x24);
953 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x24)\n"); 953 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x24)\n");
954 return(FALSE); 954 return(FALSE);
955 } 955 }
956 return TRUE; 956 return TRUE;
@@ -975,13 +975,13 @@ BOOL MACbSafeStop (DWORD_PTR dwIoBase)
975 975
976 if (MACbSafeRxOff(dwIoBase) == FALSE) { 976 if (MACbSafeRxOff(dwIoBase) == FALSE) {
977 DBG_PORT80(0xA1); 977 DBG_PORT80(0xA1);
978 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeRxOff == FALSE)\n"); 978 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeRxOff == FALSE)\n");
979 MACbSafeSoftwareReset(dwIoBase); 979 MACbSafeSoftwareReset(dwIoBase);
980 return FALSE; 980 return FALSE;
981 } 981 }
982 if (MACbSafeTxOff(dwIoBase) == FALSE) { 982 if (MACbSafeTxOff(dwIoBase) == FALSE) {
983 DBG_PORT80(0xA2); 983 DBG_PORT80(0xA2);
984 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeTxOff == FALSE)\n"); 984 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" MACbSafeTxOff == FALSE)\n");
985 MACbSafeSoftwareReset(dwIoBase); 985 MACbSafeSoftwareReset(dwIoBase);
986 return FALSE; 986 return FALSE;
987 } 987 }
@@ -1216,7 +1216,7 @@ BYTE byOrgDMACtl;
1216 } 1216 }
1217 if (ww == W_MAX_TIMEOUT) { 1217 if (ww == W_MAX_TIMEOUT) {
1218 DBG_PORT80(0x26); 1218 DBG_PORT80(0x26);
1219 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x26)\n"); 1219 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x26)\n");
1220 } 1220 }
1221 VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, dwCurrDescAddr); 1221 VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, dwCurrDescAddr);
1222 if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) { 1222 if (BITbIsAllBitsOn(byOrgDMACtl, DMACTL_RUN)) {
@@ -1346,7 +1346,7 @@ UINT ww = 0;
1346 } 1346 }
1347 if (ww == W_MAX_TIMEOUT) { 1347 if (ww == W_MAX_TIMEOUT) {
1348 DBG_PORT80(0x29); 1348 DBG_PORT80(0x29);
1349 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x29)\n"); 1349 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x29)\n");
1350 return FALSE; 1350 return FALSE;
1351 } 1351 }
1352 return TRUE; 1352 return TRUE;
@@ -1370,7 +1370,7 @@ void MACvClearBusSusInd (DWORD_PTR dwIoBase)
1370 } 1370 }
1371 if (ww == W_MAX_TIMEOUT) { 1371 if (ww == W_MAX_TIMEOUT) {
1372 DBG_PORT80(0x33); 1372 DBG_PORT80(0x33);
1373 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x33)\n"); 1373 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x33)\n");
1374 } 1374 }
1375} 1375}
1376 1376
@@ -1392,7 +1392,7 @@ void MACvEnableBusSusEn (DWORD_PTR dwIoBase)
1392 } 1392 }
1393 if (ww == W_MAX_TIMEOUT) { 1393 if (ww == W_MAX_TIMEOUT) {
1394 DBG_PORT80(0x34); 1394 DBG_PORT80(0x34);
1395 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x34)\n"); 1395 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x34)\n");
1396 } 1396 }
1397} 1397}
1398 1398
@@ -1415,7 +1415,7 @@ BOOL MACbFlushSYNCFifo (DWORD_PTR dwIoBase)
1415 } 1415 }
1416 if (ww == W_MAX_TIMEOUT) { 1416 if (ww == W_MAX_TIMEOUT) {
1417 DBG_PORT80(0x35); 1417 DBG_PORT80(0x35);
1418 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x33)\n"); 1418 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x33)\n");
1419 } 1419 }
1420 return TRUE; 1420 return TRUE;
1421} 1421}
@@ -1439,7 +1439,7 @@ BOOL MACbPSWakeup (DWORD_PTR dwIoBase)
1439 } 1439 }
1440 if (ww == W_MAX_TIMEOUT) { 1440 if (ww == W_MAX_TIMEOUT) {
1441 DBG_PORT80(0x36); 1441 DBG_PORT80(0x36);
1442 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x33)\n"); 1442 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" DBG_PORT80(0x33)\n");
1443 return FALSE; 1443 return FALSE;
1444 } 1444 }
1445 return TRUE; 1445 return TRUE;
@@ -1470,7 +1470,7 @@ int ii;
1470 return; 1470 return;
1471 1471
1472 1472
1473 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetKeyEntry\n"); 1473 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetKeyEntry\n");
1474 wOffset = MISCFIFO_KEYETRY0; 1474 wOffset = MISCFIFO_KEYETRY0;
1475 wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); 1475 wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE);
1476 1476
@@ -1478,7 +1478,7 @@ int ii;
1478 dwData |= wKeyCtl; 1478 dwData |= wKeyCtl;
1479 dwData <<= 16; 1479 dwData <<= 16;
1480 dwData |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5)); 1480 dwData |= MAKEWORD(*(pbyAddr+4), *(pbyAddr+5));
1481 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData, wKeyCtl); 1481 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData, wKeyCtl);
1482 1482
1483 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset); 1483 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
1484 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData); 1484 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
@@ -1493,7 +1493,7 @@ int ii;
1493 dwData |= *(pbyAddr+1); 1493 dwData |= *(pbyAddr+1);
1494 dwData <<= 8; 1494 dwData <<= 8;
1495 dwData |= *(pbyAddr+0); 1495 dwData |= *(pbyAddr+0);
1496 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %lX\n", wOffset, dwData); 1496 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2. wOffset: %d, Data: %lX\n", wOffset, dwData);
1497 1497
1498 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset); 1498 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
1499 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData); 1499 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
@@ -1503,7 +1503,7 @@ int ii;
1503 wOffset += (uKeyIdx * 4); 1503 wOffset += (uKeyIdx * 4);
1504 for (ii=0;ii<4;ii++) { 1504 for (ii=0;ii<4;ii++) {
1505 // alway push 128 bits 1505 // alway push 128 bits
1506 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"3.(%d) wOffset: %d, Data: %lX\n", ii, wOffset+ii, *pdwKey); 1506 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"3.(%d) wOffset: %d, Data: %lX\n", ii, wOffset+ii, *pdwKey);
1507 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+ii); 1507 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+ii);
1508 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++); 1508 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++);
1509 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); 1509 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
@@ -1563,7 +1563,7 @@ int ii;
1563 if (byLocalID <= 1) 1563 if (byLocalID <= 1)
1564 return; 1564 return;
1565 1565
1566 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetDefaultKeyEntry\n"); 1566 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetDefaultKeyEntry\n");
1567 wOffset = MISCFIFO_KEYETRY0; 1567 wOffset = MISCFIFO_KEYETRY0;
1568 wOffset += (10 * MISCFIFO_KEYENTRYSIZE); 1568 wOffset += (10 * MISCFIFO_KEYENTRYSIZE);
1569 1569
@@ -1572,7 +1572,7 @@ int ii;
1572 wOffset += (uKeyIdx * 4); 1572 wOffset += (uKeyIdx * 4);
1573 // alway push 128 bits 1573 // alway push 128 bits
1574 for (ii=0; ii<3; ii++) { 1574 for (ii=0; ii<3; ii++) {
1575 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"(%d) wOffset: %d, Data: %lX\n", ii, wOffset+ii, *pdwKey); 1575 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"(%d) wOffset: %d, Data: %lX\n", ii, wOffset+ii, *pdwKey);
1576 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+ii); 1576 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+ii);
1577 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++); 1577 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++);
1578 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); 1578 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
@@ -1584,7 +1584,7 @@ int ii;
1584 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+3); 1584 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+3);
1585 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData); 1585 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
1586 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); 1586 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
1587 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"End. wOffset: %d, Data: %lX\n", wOffset+3, dwData); 1587 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"End. wOffset: %d, Data: %lX\n", wOffset+3, dwData);
1588 1588
1589} 1589}
1590 1590
@@ -1620,7 +1620,7 @@ DWORD dwData;
1620 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset); 1620 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
1621 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData); 1621 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
1622 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); 1622 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
1623 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvEnableDefaultKey: wOffset: %d, Data: %lX\n", wOffset, dwData); 1623 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvEnableDefaultKey: wOffset: %d, Data: %lX\n", wOffset, dwData);
1624 1624
1625} 1625}
1626*/ 1626*/
@@ -1652,7 +1652,7 @@ DWORD dwData;
1652 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset); 1652 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
1653 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData); 1653 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
1654 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); 1654 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
1655 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvDisableDefaultKey: wOffset: %d, Data: %lX\n", wOffset, dwData); 1655 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvDisableDefaultKey: wOffset: %d, Data: %lX\n", wOffset, dwData);
1656} 1656}
1657 1657
1658/* 1658/*
@@ -1679,7 +1679,7 @@ int ii;
1679 return; 1679 return;
1680 1680
1681 1681
1682 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetDefaultTKIPKeyEntry\n"); 1682 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetDefaultTKIPKeyEntry\n");
1683 wOffset = MISCFIFO_KEYETRY0; 1683 wOffset = MISCFIFO_KEYETRY0;
1684 // Kyle test : change offset from 10 -> 0 1684 // Kyle test : change offset from 10 -> 0
1685 wOffset += (10 * MISCFIFO_KEYENTRYSIZE); 1685 wOffset += (10 * MISCFIFO_KEYENTRYSIZE);
@@ -1697,10 +1697,10 @@ int ii;
1697 wOffset++; 1697 wOffset++;
1698 1698
1699 wOffset += (uKeyIdx * 4); 1699 wOffset += (uKeyIdx * 4);
1700 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, idx:%d\n", wOffset, *pdwKey, uKeyIdx); 1700 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, idx:%d\n", wOffset, *pdwKey, uKeyIdx);
1701 // alway push 128 bits 1701 // alway push 128 bits
1702 for (ii=0; ii<4; ii++) { 1702 for (ii=0; ii<4; ii++) {
1703 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.(%d) wOffset: %d, Data: %lX\n", ii, wOffset+ii, *pdwKey); 1703 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"2.(%d) wOffset: %d, Data: %lX\n", ii, wOffset+ii, *pdwKey);
1704 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+ii); 1704 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset+ii);
1705 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++); 1705 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, *pdwKey++);
1706 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE); 1706 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFCTL, MISCFFCTL_WRITE);
@@ -1734,7 +1734,7 @@ DWORD dwData;
1734 return; 1734 return;
1735 1735
1736 1736
1737 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetKeyEntry\n"); 1737 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MACvSetKeyEntry\n");
1738 wOffset = MISCFIFO_KEYETRY0; 1738 wOffset = MISCFIFO_KEYETRY0;
1739 wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE); 1739 wOffset += (uEntryIdx * MISCFIFO_KEYENTRYSIZE);
1740 1740
@@ -1742,7 +1742,7 @@ DWORD dwData;
1742 dwData |= wKeyCtl; 1742 dwData |= wKeyCtl;
1743 dwData <<= 16; 1743 dwData <<= 16;
1744 dwData |= 0xffff; 1744 dwData |= 0xffff;
1745 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData, wKeyCtl); 1745 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"1. wOffset: %d, Data: %lX, KeyCtl:%X\n", wOffset, dwData, wKeyCtl);
1746 1746
1747 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset); 1747 VNSvOutPortW(dwIoBase + MAC_REG_MISCFFNDEX, wOffset);
1748 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData); 1748 VNSvOutPortD(dwIoBase + MAC_REG_MISCFFDATA, dwData);
diff --git a/drivers/staging/vt6655/mib.c b/drivers/staging/vt6655/mib.c
index 3f06de141a8..2fc54e9dea3 100644
--- a/drivers/staging/vt6655/mib.c
+++ b/drivers/staging/vt6655/mib.c
@@ -231,87 +231,87 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
231 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 231 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
232 pStatistic->CustomStat.ullRsr11MCRCOk++; 232 pStatistic->CustomStat.ullRsr11MCRCOk++;
233 } 233 }
234 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR); 234 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"11M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr11M, (INT)pStatistic->CustomStat.ullRsr11MCRCOk, byRSR);
235 } 235 }
236 else if(byRxRate==11) { 236 else if(byRxRate==11) {
237 pStatistic->CustomStat.ullRsr5M++; 237 pStatistic->CustomStat.ullRsr5M++;
238 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 238 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
239 pStatistic->CustomStat.ullRsr5MCRCOk++; 239 pStatistic->CustomStat.ullRsr5MCRCOk++;
240 } 240 }
241 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR); 241 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 5M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr5M, (INT)pStatistic->CustomStat.ullRsr5MCRCOk, byRSR);
242 } 242 }
243 else if(byRxRate==4) { 243 else if(byRxRate==4) {
244 pStatistic->CustomStat.ullRsr2M++; 244 pStatistic->CustomStat.ullRsr2M++;
245 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 245 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
246 pStatistic->CustomStat.ullRsr2MCRCOk++; 246 pStatistic->CustomStat.ullRsr2MCRCOk++;
247 } 247 }
248 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR); 248 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 2M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr2M, (INT)pStatistic->CustomStat.ullRsr2MCRCOk, byRSR);
249 } 249 }
250 else if(byRxRate==2){ 250 else if(byRxRate==2){
251 pStatistic->CustomStat.ullRsr1M++; 251 pStatistic->CustomStat.ullRsr1M++;
252 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 252 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
253 pStatistic->CustomStat.ullRsr1MCRCOk++; 253 pStatistic->CustomStat.ullRsr1MCRCOk++;
254 } 254 }
255 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR); 255 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 1M: ALL[%d], OK[%d]:[%02x]\n", (INT)pStatistic->CustomStat.ullRsr1M, (INT)pStatistic->CustomStat.ullRsr1MCRCOk, byRSR);
256 } 256 }
257 else if(byRxRate==12){ 257 else if(byRxRate==12){
258 pStatistic->CustomStat.ullRsr6M++; 258 pStatistic->CustomStat.ullRsr6M++;
259 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 259 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
260 pStatistic->CustomStat.ullRsr6MCRCOk++; 260 pStatistic->CustomStat.ullRsr6MCRCOk++;
261 } 261 }
262 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk); 262 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 6M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr6M, (INT)pStatistic->CustomStat.ullRsr6MCRCOk);
263 } 263 }
264 else if(byRxRate==18){ 264 else if(byRxRate==18){
265 pStatistic->CustomStat.ullRsr9M++; 265 pStatistic->CustomStat.ullRsr9M++;
266 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 266 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
267 pStatistic->CustomStat.ullRsr9MCRCOk++; 267 pStatistic->CustomStat.ullRsr9MCRCOk++;
268 } 268 }
269 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk); 269 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" 9M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr9M, (INT)pStatistic->CustomStat.ullRsr9MCRCOk);
270 } 270 }
271 else if(byRxRate==24){ 271 else if(byRxRate==24){
272 pStatistic->CustomStat.ullRsr12M++; 272 pStatistic->CustomStat.ullRsr12M++;
273 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 273 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
274 pStatistic->CustomStat.ullRsr12MCRCOk++; 274 pStatistic->CustomStat.ullRsr12MCRCOk++;
275 } 275 }
276 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk); 276 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"12M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr12M, (INT)pStatistic->CustomStat.ullRsr12MCRCOk);
277 } 277 }
278 else if(byRxRate==36){ 278 else if(byRxRate==36){
279 pStatistic->CustomStat.ullRsr18M++; 279 pStatistic->CustomStat.ullRsr18M++;
280 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 280 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
281 pStatistic->CustomStat.ullRsr18MCRCOk++; 281 pStatistic->CustomStat.ullRsr18MCRCOk++;
282 } 282 }
283 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk); 283 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"18M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr18M, (INT)pStatistic->CustomStat.ullRsr18MCRCOk);
284 } 284 }
285 else if(byRxRate==48){ 285 else if(byRxRate==48){
286 pStatistic->CustomStat.ullRsr24M++; 286 pStatistic->CustomStat.ullRsr24M++;
287 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 287 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
288 pStatistic->CustomStat.ullRsr24MCRCOk++; 288 pStatistic->CustomStat.ullRsr24MCRCOk++;
289 } 289 }
290 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk); 290 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"24M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr24M, (INT)pStatistic->CustomStat.ullRsr24MCRCOk);
291 } 291 }
292 else if(byRxRate==72){ 292 else if(byRxRate==72){
293 pStatistic->CustomStat.ullRsr36M++; 293 pStatistic->CustomStat.ullRsr36M++;
294 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 294 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
295 pStatistic->CustomStat.ullRsr36MCRCOk++; 295 pStatistic->CustomStat.ullRsr36MCRCOk++;
296 } 296 }
297 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk); 297 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"36M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr36M, (INT)pStatistic->CustomStat.ullRsr36MCRCOk);
298 } 298 }
299 else if(byRxRate==96){ 299 else if(byRxRate==96){
300 pStatistic->CustomStat.ullRsr48M++; 300 pStatistic->CustomStat.ullRsr48M++;
301 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 301 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
302 pStatistic->CustomStat.ullRsr48MCRCOk++; 302 pStatistic->CustomStat.ullRsr48MCRCOk++;
303 } 303 }
304 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk); 304 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"48M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr48M, (INT)pStatistic->CustomStat.ullRsr48MCRCOk);
305 } 305 }
306 else if(byRxRate==108){ 306 else if(byRxRate==108){
307 pStatistic->CustomStat.ullRsr54M++; 307 pStatistic->CustomStat.ullRsr54M++;
308 if(BITbIsBitOn(byRSR, RSR_CRCOK)) { 308 if(BITbIsBitOn(byRSR, RSR_CRCOK)) {
309 pStatistic->CustomStat.ullRsr54MCRCOk++; 309 pStatistic->CustomStat.ullRsr54MCRCOk++;
310 } 310 }
311 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk); 311 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"54M: ALL[%d], OK[%d]\n", (INT)pStatistic->CustomStat.ullRsr54M, (INT)pStatistic->CustomStat.ullRsr54MCRCOk);
312 } 312 }
313 else { 313 else {
314 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk); 314 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Unknown: Total[%d], CRCOK[%d]\n", (INT)pStatistic->dwRsrRxPacket+1, (INT)pStatistic->dwRsrCRCOk);
315 } 315 }
316 316
317 if (BITbIsBitOn(byRSR, RSR_BSSIDOK)) 317 if (BITbIsBitOn(byRSR, RSR_BSSIDOK))
diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index 8e2f6c762fb..3661f8d2164 100644
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -154,7 +154,7 @@ PSvEnablePowerSaving(
154 PSbSendNullPacket(pDevice); 154 PSbSendNullPacket(pDevice);
155 } 155 }
156 pDevice->bPWBitOn = TRUE; 156 pDevice->bPWBitOn = TRUE;
157 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable... \n"); 157 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "PS:Power Saving Mode Enable... \n");
158 return; 158 return;
159} 159}
160 160
@@ -261,7 +261,7 @@ PSbConsiderPowerDown(
261 261
262 // no Tx, no Rx isr, now go to Doze 262 // no Tx, no Rx isr, now go to Doze
263 MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_GO2DOZE); 263 MACvRegBitsOn(pDevice->PortOffset, MAC_REG_PSCTL, PSCTL_GO2DOZE);
264 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Go to Doze ZZZZZZZZZZZZZZZ\n"); 264 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Go to Doze ZZZZZZZZZZZZZZZ\n");
265 return TRUE; 265 return TRUE;
266} 266}
267 267
@@ -305,10 +305,10 @@ PSvSendPSPOLL(
305 pTxPacket->cbPayloadLen = 0; 305 pTxPacket->cbPayloadLen = 0;
306 // send the frame 306 // send the frame
307 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { 307 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
308 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet failed..\n"); 308 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet failed..\n");
309 } 309 }
310 else { 310 else {
311// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet success..\n"); 311// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send PS-Poll packet success..\n");
312 }; 312 };
313 313
314 return; 314 return;
@@ -389,12 +389,12 @@ PSbSendNullPacket(
389 pTxPacket->cbPayloadLen = 0; 389 pTxPacket->cbPayloadLen = 0;
390 // send the frame 390 // send the frame
391 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { 391 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
392 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n"); 392 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet failed !\n");
393 return FALSE; 393 return FALSE;
394 } 394 }
395 else { 395 else {
396 396
397// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n"); 397// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Send Null Packet success....\n");
398 } 398 }
399 399
400 400
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index c8a4a5533c7..d7947217674 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -167,7 +167,7 @@ static
167VOID 167VOID
168s_vFillRTSHead( 168s_vFillRTSHead(
169 IN PSDevice pDevice, 169 IN PSDevice pDevice,
170 IN BYTE byPktTyp, 170 IN BYTE byPktType,
171 IN PVOID pvRTS, 171 IN PVOID pvRTS,
172 IN UINT cbFrameLength, 172 IN UINT cbFrameLength,
173 IN BOOL bNeedAck, 173 IN BOOL bNeedAck,
@@ -181,7 +181,7 @@ static
181VOID 181VOID
182s_vGenerateTxParameter( 182s_vGenerateTxParameter(
183 IN PSDevice pDevice, 183 IN PSDevice pDevice,
184 IN BYTE byPktTyp, 184 IN BYTE byPktType,
185 IN PVOID pTxBufHead, 185 IN PVOID pTxBufHead,
186 IN PVOID pvRrvTime, 186 IN PVOID pvRrvTime,
187 IN PVOID pvRTS, 187 IN PVOID pvRTS,
@@ -209,7 +209,7 @@ static
209UINT 209UINT
210s_cbFillTxBufHead ( 210s_cbFillTxBufHead (
211 IN PSDevice pDevice, 211 IN PSDevice pDevice,
212 IN BYTE byPktTyp, 212 IN BYTE byPktType,
213 IN PBYTE pbyTxBufferAddr, 213 IN PBYTE pbyTxBufferAddr,
214 IN UINT cbFrameBodySize, 214 IN UINT cbFrameBodySize,
215 IN UINT uDMAIdx, 215 IN UINT uDMAIdx,
@@ -227,7 +227,7 @@ static
227UINT 227UINT
228s_uFillDataHead ( 228s_uFillDataHead (
229 IN PSDevice pDevice, 229 IN PSDevice pDevice,
230 IN BYTE byPktTyp, 230 IN BYTE byPktType,
231 IN PVOID pTxDataHead, 231 IN PVOID pTxDataHead,
232 IN UINT cbFrameLength, 232 IN UINT cbFrameLength,
233 IN UINT uDMAIdx, 233 IN UINT uDMAIdx,
@@ -308,7 +308,7 @@ s_vFillTxKey (
308 *(pbyIVHead+3) = (BYTE)(((byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV 308 *(pbyIVHead+3) = (BYTE)(((byKeyIndex << 6) & 0xc0) | 0x20); // 0x20 is ExtIV
309 // Append IV&ExtIV after Mac Header 309 // Append IV&ExtIV after Mac Header
310 *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16); 310 *pdwExtIV = cpu_to_le32(pTransmitKey->dwTSC47_16);
311 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %lx\n", *pdwExtIV); 311 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFillTxKey()---- pdwExtIV: %lx\n", *pdwExtIV);
312 312
313 } else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) { 313 } else if (pTransmitKey->byCipherSuite == KEY_CTL_CCMP) {
314 pTransmitKey->wTSC15_0++; 314 pTransmitKey->wTSC15_0++;
@@ -406,7 +406,7 @@ s_vSWencryption (
406 406
407 407
408 408
409/*byPktTyp : PK_TYPE_11A 0 409/*byPktType : PK_TYPE_11A 0
410 PK_TYPE_11B 1 410 PK_TYPE_11B 1
411 PK_TYPE_11GB 2 411 PK_TYPE_11GB 2
412 PK_TYPE_11GA 3 412 PK_TYPE_11GA 3
@@ -415,7 +415,7 @@ static
415UINT 415UINT
416s_uGetTxRsvTime ( 416s_uGetTxRsvTime (
417 IN PSDevice pDevice, 417 IN PSDevice pDevice,
418 IN BYTE byPktTyp, 418 IN BYTE byPktType,
419 IN UINT cbFrameLength, 419 IN UINT cbFrameLength,
420 IN WORD wRate, 420 IN WORD wRate,
421 IN BOOL bNeedAck 421 IN BOOL bNeedAck
@@ -423,14 +423,14 @@ s_uGetTxRsvTime (
423{ 423{
424 UINT uDataTime, uAckTime; 424 UINT uDataTime, uAckTime;
425 425
426 uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, cbFrameLength, wRate); 426 uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate);
427#ifdef PLICE_DEBUG 427#ifdef PLICE_DEBUG
428 //printk("s_uGetTxRsvTime is %d\n",uDataTime); 428 //printk("s_uGetTxRsvTime is %d\n",uDataTime);
429#endif 429#endif
430 if (byPktTyp == PK_TYPE_11B) {//llb,CCK mode 430 if (byPktType == PK_TYPE_11B) {//llb,CCK mode
431 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, (WORD)pDevice->byTopCCKBasicRate); 431 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (WORD)pDevice->byTopCCKBasicRate);
432 } else {//11g 2.4G OFDM mode & 11a 5G OFDM mode 432 } else {//11g 2.4G OFDM mode & 11a 5G OFDM mode
433 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, (WORD)pDevice->byTopOFDMBasicRate); 433 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, (WORD)pDevice->byTopOFDMBasicRate);
434 } 434 }
435 435
436 if (bNeedAck) { 436 if (bNeedAck) {
@@ -447,7 +447,7 @@ UINT
447s_uGetRTSCTSRsvTime ( 447s_uGetRTSCTSRsvTime (
448 IN PSDevice pDevice, 448 IN PSDevice pDevice,
449 IN BYTE byRTSRsvType, 449 IN BYTE byRTSRsvType,
450 IN BYTE byPktTyp, 450 IN BYTE byPktType,
451 IN UINT cbFrameLength, 451 IN UINT cbFrameLength,
452 IN WORD wCurrentRate 452 IN WORD wCurrentRate
453 ) 453 )
@@ -457,23 +457,23 @@ s_uGetRTSCTSRsvTime (
457 uRrvTime = uRTSTime = uCTSTime = uAckTime = uDataTime = 0; 457 uRrvTime = uRTSTime = uCTSTime = uAckTime = uDataTime = 0;
458 458
459 459
460 uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, cbFrameLength, wCurrentRate); 460 uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wCurrentRate);
461 if (byRTSRsvType == 0) { //RTSTxRrvTime_bb 461 if (byRTSRsvType == 0) { //RTSTxRrvTime_bb
462 uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 20, pDevice->byTopCCKBasicRate); 462 uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate);
463 uCTSTime = uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, pDevice->byTopCCKBasicRate); 463 uCTSTime = uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
464 } 464 }
465 else if (byRTSRsvType == 1){ //RTSTxRrvTime_ba, only in 2.4GHZ 465 else if (byRTSRsvType == 1){ //RTSTxRrvTime_ba, only in 2.4GHZ
466 uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 20, pDevice->byTopCCKBasicRate); 466 uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopCCKBasicRate);
467 uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, pDevice->byTopCCKBasicRate); 467 uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
468 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, pDevice->byTopOFDMBasicRate); 468 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
469 } 469 }
470 else if (byRTSRsvType == 2) { //RTSTxRrvTime_aa 470 else if (byRTSRsvType == 2) { //RTSTxRrvTime_aa
471 uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 20, pDevice->byTopOFDMBasicRate); 471 uRTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 20, pDevice->byTopOFDMBasicRate);
472 uCTSTime = uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, pDevice->byTopOFDMBasicRate); 472 uCTSTime = uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
473 } 473 }
474 else if (byRTSRsvType == 3) { //CTSTxRrvTime_ba, only in 2.4GHZ 474 else if (byRTSRsvType == 3) { //CTSTxRrvTime_ba, only in 2.4GHZ
475 uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, pDevice->byTopCCKBasicRate); 475 uCTSTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopCCKBasicRate);
476 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktTyp, 14, pDevice->byTopOFDMBasicRate); 476 uAckTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, 14, pDevice->byTopOFDMBasicRate);
477 uRrvTime = uCTSTime + uAckTime + uDataTime + 2*pDevice->uSIFS; 477 uRrvTime = uCTSTime + uAckTime + uDataTime + 2*pDevice->uSIFS;
478 return uRrvTime; 478 return uRrvTime;
479 } 479 }
@@ -757,7 +757,7 @@ static
757UINT 757UINT
758s_uFillDataHead ( 758s_uFillDataHead (
759 IN PSDevice pDevice, 759 IN PSDevice pDevice,
760 IN BYTE byPktTyp, 760 IN BYTE byPktType,
761 IN PVOID pTxDataHead, 761 IN PVOID pTxDataHead,
762 IN UINT cbFrameLength, 762 IN UINT cbFrameLength,
763 IN UINT uDMAIdx, 763 IN UINT uDMAIdx,
@@ -775,11 +775,11 @@ s_uFillDataHead (
775 return 0; 775 return 0;
776 } 776 }
777 777
778 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) { 778 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
779 if (byFBOption == AUTO_FB_NONE) { 779 if (byFBOption == AUTO_FB_NONE) {
780 PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead; 780 PSTxDataHead_g pBuf = (PSTxDataHead_g)pTxDataHead;
781 //Get SignalField,ServiceField,Length 781 //Get SignalField,ServiceField,Length
782 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktTyp, 782 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
783 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 783 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
784 ); 784 );
785 pBuf->wTransmitLength_a = cpu_to_le16(wLen); 785 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
@@ -789,7 +789,7 @@ s_uFillDataHead (
789 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 789 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
790 //Get Duration and TimeStamp 790 //Get Duration and TimeStamp
791 pBuf->wDuration_a = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, 791 pBuf->wDuration_a = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength,
792 byPktTyp, wCurrentRate, bNeedAck, uFragIdx, 792 byPktType, wCurrentRate, bNeedAck, uFragIdx,
793 cbLastFragmentSize, uMACfragNum, 793 cbLastFragmentSize, uMACfragNum,
794 byFBOption)); //1: 2.4GHz 794 byFBOption)); //1: 2.4GHz
795 pBuf->wDuration_b = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, 795 pBuf->wDuration_b = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength,
@@ -805,7 +805,7 @@ s_uFillDataHead (
805 // Auto Fallback 805 // Auto Fallback
806 PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead; 806 PSTxDataHead_g_FB pBuf = (PSTxDataHead_g_FB)pTxDataHead;
807 //Get SignalField,ServiceField,Length 807 //Get SignalField,ServiceField,Length
808 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktTyp, 808 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
809 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 809 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
810 ); 810 );
811 pBuf->wTransmitLength_a = cpu_to_le16(wLen); 811 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
@@ -814,13 +814,13 @@ s_uFillDataHead (
814 ); 814 );
815 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 815 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
816 //Get Duration and TimeStamp 816 //Get Duration and TimeStamp
817 pBuf->wDuration_a = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktTyp, 817 pBuf->wDuration_a = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
818 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz 818 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz
819 pBuf->wDuration_b = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, PK_TYPE_11B, 819 pBuf->wDuration_b = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, PK_TYPE_11B,
820 pDevice->byTopCCKBasicRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz 820 pDevice->byTopCCKBasicRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz
821 pBuf->wDuration_a_f0 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktTyp, 821 pBuf->wDuration_a_f0 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType,
822 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz 822 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz
823 pBuf->wDuration_a_f1 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktTyp, 823 pBuf->wDuration_a_f1 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType,
824 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz 824 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //1: 2.4GHz
825 825
826 pBuf->wTimeStampOff_a = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]); 826 pBuf->wTimeStampOff_a = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]);
@@ -829,35 +829,35 @@ s_uFillDataHead (
829 return (pBuf->wDuration_a); 829 return (pBuf->wDuration_a);
830 } //if (byFBOption == AUTO_FB_NONE) 830 } //if (byFBOption == AUTO_FB_NONE)
831 } 831 }
832 else if (byPktTyp == PK_TYPE_11A) { 832 else if (byPktType == PK_TYPE_11A) {
833 if ((byFBOption != AUTO_FB_NONE)) { 833 if ((byFBOption != AUTO_FB_NONE)) {
834 // Auto Fallback 834 // Auto Fallback
835 PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead; 835 PSTxDataHead_a_FB pBuf = (PSTxDataHead_a_FB)pTxDataHead;
836 //Get SignalField,ServiceField,Length 836 //Get SignalField,ServiceField,Length
837 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktTyp, 837 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
838 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 838 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
839 ); 839 );
840 pBuf->wTransmitLength = cpu_to_le16(wLen); 840 pBuf->wTransmitLength = cpu_to_le16(wLen);
841 //Get Duration and TimeStampOff 841 //Get Duration and TimeStampOff
842 842
843 pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktTyp, 843 pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
844 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz 844 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz
845 pBuf->wDuration_f0 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktTyp, 845 pBuf->wDuration_f0 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F0, cbFrameLength, byPktType,
846 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz 846 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz
847 pBuf->wDuration_f1 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktTyp, 847 pBuf->wDuration_f1 = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A_F1, cbFrameLength, byPktType,
848 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz 848 wCurrentRate, bNeedAck, uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption)); //0: 5GHz
849 pBuf->wTimeStampOff = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]); 849 pBuf->wTimeStampOff = cpu_to_le16(wTimeStampOff[pDevice->byPreambleType%2][wCurrentRate%MAX_RATE]);
850 return (pBuf->wDuration); 850 return (pBuf->wDuration);
851 } else { 851 } else {
852 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead; 852 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
853 //Get SignalField,ServiceField,Length 853 //Get SignalField,ServiceField,Length
854 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktTyp, 854 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
855 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 855 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
856 ); 856 );
857 pBuf->wTransmitLength = cpu_to_le16(wLen); 857 pBuf->wTransmitLength = cpu_to_le16(wLen);
858 //Get Duration and TimeStampOff 858 //Get Duration and TimeStampOff
859 859
860 pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktTyp, 860 pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameLength, byPktType,
861 wCurrentRate, bNeedAck, uFragIdx, 861 wCurrentRate, bNeedAck, uFragIdx,
862 cbLastFragmentSize, uMACfragNum, 862 cbLastFragmentSize, uMACfragNum,
863 byFBOption)); 863 byFBOption));
@@ -869,12 +869,12 @@ s_uFillDataHead (
869 else { 869 else {
870 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead; 870 PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead;
871 //Get SignalField,ServiceField,Length 871 //Get SignalField,ServiceField,Length
872 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktTyp, 872 BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType,
873 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 873 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
874 ); 874 );
875 pBuf->wTransmitLength = cpu_to_le16(wLen); 875 pBuf->wTransmitLength = cpu_to_le16(wLen);
876 //Get Duration and TimeStampOff 876 //Get Duration and TimeStampOff
877 pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktTyp, 877 pBuf->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameLength, byPktType,
878 wCurrentRate, bNeedAck, uFragIdx, 878 wCurrentRate, bNeedAck, uFragIdx,
879 cbLastFragmentSize, uMACfragNum, 879 cbLastFragmentSize, uMACfragNum,
880 byFBOption)); 880 byFBOption));
@@ -889,7 +889,7 @@ static
889VOID 889VOID
890s_vFillRTSHead ( 890s_vFillRTSHead (
891 IN PSDevice pDevice, 891 IN PSDevice pDevice,
892 IN BYTE byPktTyp, 892 IN BYTE byPktType,
893 IN PVOID pvRTS, 893 IN PVOID pvRTS,
894 IN UINT cbFrameLength, 894 IN UINT cbFrameLength,
895 IN BOOL bNeedAck, 895 IN BOOL bNeedAck,
@@ -916,7 +916,7 @@ s_vFillRTSHead (
916 916
917 // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account. 917 // Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account.
918 // Otherwise, we need to modified codes for them. 918 // Otherwise, we need to modified codes for them.
919 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) { 919 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
920 if (byFBOption == AUTO_FB_NONE) { 920 if (byFBOption == AUTO_FB_NONE) {
921 PSRTS_g pBuf = (PSRTS_g)pvRTS; 921 PSRTS_g pBuf = (PSRTS_g)pvRTS;
922 //Get SignalField,ServiceField,Length 922 //Get SignalField,ServiceField,Length
@@ -924,14 +924,14 @@ s_vFillRTSHead (
924 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 924 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
925 ); 925 );
926 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 926 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
927 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktTyp, 927 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
928 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 928 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
929 ); 929 );
930 pBuf->wTransmitLength_a = cpu_to_le16(wLen); 930 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
931 //Get Duration 931 //Get Duration
932 pBuf->wDuration_bb = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData 932 pBuf->wDuration_bb = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData
933 pBuf->wDuration_aa = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData 933 pBuf->wDuration_aa = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3: 2.4G OFDMData
934 pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data 934 pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data
935 935
936 pBuf->Data.wDurationID = pBuf->wDuration_aa; 936 pBuf->Data.wDurationID = pBuf->wDuration_aa;
937 //Get RTS Frame body 937 //Get RTS Frame body
@@ -957,19 +957,19 @@ s_vFillRTSHead (
957 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b) 957 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_b), (PBYTE)&(pBuf->bySignalField_b)
958 ); 958 );
959 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 959 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
960 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktTyp, 960 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
961 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a) 961 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField_a), (PBYTE)&(pBuf->bySignalField_a)
962 ); 962 );
963 pBuf->wTransmitLength_a = cpu_to_le16(wLen); 963 pBuf->wTransmitLength_a = cpu_to_le16(wLen);
964 964
965 //Get Duration 965 //Get Duration
966 pBuf->wDuration_bb = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData 966 pBuf->wDuration_bb = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, PK_TYPE_11B, pDevice->byTopCCKBasicRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData
967 pBuf->wDuration_aa = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3:2.4G OFDMData 967 pBuf->wDuration_aa = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //2:RTSDuration_aa, 1:2.4G, 2,3:2.4G OFDMData
968 pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDMData 968 pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //1:RTSDuration_ba, 1:2.4G, 2,3:2.4G OFDMData
969 pBuf->wRTSDuration_ba_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F0, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //4:wRTSDuration_ba_f0, 1:2.4G, 1:CCKData 969 pBuf->wRTSDuration_ba_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //4:wRTSDuration_ba_f0, 1:2.4G, 1:CCKData
970 pBuf->wRTSDuration_aa_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //5:wRTSDuration_aa_f0, 1:2.4G, 1:CCKData 970 pBuf->wRTSDuration_aa_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:wRTSDuration_aa_f0, 1:2.4G, 1:CCKData
971 pBuf->wRTSDuration_ba_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F1, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //6:wRTSDuration_ba_f1, 1:2.4G, 1:CCKData 971 pBuf->wRTSDuration_ba_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //6:wRTSDuration_ba_f1, 1:2.4G, 1:CCKData
972 pBuf->wRTSDuration_aa_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //7:wRTSDuration_aa_f1, 1:2.4G, 1:CCKData 972 pBuf->wRTSDuration_aa_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:wRTSDuration_aa_f1, 1:2.4G, 1:CCKData
973 pBuf->Data.wDurationID = pBuf->wDuration_aa; 973 pBuf->Data.wDurationID = pBuf->wDuration_aa;
974 //Get RTS Frame body 974 //Get RTS Frame body
975 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 975 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4
@@ -991,16 +991,16 @@ s_vFillRTSHead (
991 991
992 } // if (byFBOption == AUTO_FB_NONE) 992 } // if (byFBOption == AUTO_FB_NONE)
993 } 993 }
994 else if (byPktTyp == PK_TYPE_11A) { 994 else if (byPktType == PK_TYPE_11A) {
995 if (byFBOption == AUTO_FB_NONE) { 995 if (byFBOption == AUTO_FB_NONE) {
996 PSRTS_ab pBuf = (PSRTS_ab)pvRTS; 996 PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
997 //Get SignalField,ServiceField,Length 997 //Get SignalField,ServiceField,Length
998 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktTyp, 998 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
999 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 999 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
1000 ); 1000 );
1001 pBuf->wTransmitLength = cpu_to_le16(wLen); 1001 pBuf->wTransmitLength = cpu_to_le16(wLen);
1002 //Get Duration 1002 //Get Duration
1003 pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData 1003 pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData
1004 pBuf->Data.wDurationID = pBuf->wDuration; 1004 pBuf->Data.wDurationID = pBuf->wDuration;
1005 //Get RTS Frame body 1005 //Get RTS Frame body
1006 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 1006 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4
@@ -1024,14 +1024,14 @@ s_vFillRTSHead (
1024 else { 1024 else {
1025 PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS; 1025 PSRTS_a_FB pBuf = (PSRTS_a_FB)pvRTS;
1026 //Get SignalField,ServiceField,Length 1026 //Get SignalField,ServiceField,Length
1027 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktTyp, 1027 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopOFDMBasicRate, byPktType,
1028 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) 1028 (PWORD)&(wLen), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField)
1029 ); 1029 );
1030 pBuf->wTransmitLength = cpu_to_le16(wLen); 1030 pBuf->wTransmitLength = cpu_to_le16(wLen);
1031 //Get Duration 1031 //Get Duration
1032 pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData 1032 pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_aa, 0:5G, 0: 5G OFDMData
1033 pBuf->wRTSDuration_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData 1033 pBuf->wRTSDuration_f0 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //5:RTSDuration_aa_f0, 0:5G, 0: 5G OFDMData
1034 pBuf->wRTSDuration_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //7:RTSDuration_aa_f1, 0:5G, 0: 1034 pBuf->wRTSDuration_f1 = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_AA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //7:RTSDuration_aa_f1, 0:5G, 0:
1035 pBuf->Data.wDurationID = pBuf->wDuration; 1035 pBuf->Data.wDurationID = pBuf->wDuration;
1036 //Get RTS Frame body 1036 //Get RTS Frame body
1037 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 1037 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4
@@ -1051,7 +1051,7 @@ s_vFillRTSHead (
1051 } 1051 }
1052 } 1052 }
1053 } 1053 }
1054 else if (byPktTyp == PK_TYPE_11B) { 1054 else if (byPktType == PK_TYPE_11B) {
1055 PSRTS_ab pBuf = (PSRTS_ab)pvRTS; 1055 PSRTS_ab pBuf = (PSRTS_ab)pvRTS;
1056 //Get SignalField,ServiceField,Length 1056 //Get SignalField,ServiceField,Length
1057 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B, 1057 BBvCaculateParameter(pDevice, uRTSFrameLen, pDevice->byTopCCKBasicRate, PK_TYPE_11B,
@@ -1059,7 +1059,7 @@ s_vFillRTSHead (
1059 ); 1059 );
1060 pBuf->wTransmitLength = cpu_to_le16(wLen); 1060 pBuf->wTransmitLength = cpu_to_le16(wLen);
1061 //Get Duration 1061 //Get Duration
1062 pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData 1062 pBuf->wDuration = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, RTSDUR_BB, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //0:RTSDuration_bb, 1:2.4G, 1:CCKData
1063 pBuf->Data.wDurationID = pBuf->wDuration; 1063 pBuf->Data.wDurationID = pBuf->wDuration;
1064 //Get RTS Frame body 1064 //Get RTS Frame body
1065 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4 1065 pBuf->Data.wFrameControl = TYPE_CTL_RTS;//0x00B4
@@ -1087,7 +1087,7 @@ VOID
1087s_vFillCTSHead ( 1087s_vFillCTSHead (
1088 IN PSDevice pDevice, 1088 IN PSDevice pDevice,
1089 IN UINT uDMAIdx, 1089 IN UINT uDMAIdx,
1090 IN BYTE byPktTyp, 1090 IN BYTE byPktType,
1091 IN PVOID pvCTS, 1091 IN PVOID pvCTS,
1092 IN UINT cbFrameLength, 1092 IN UINT cbFrameLength,
1093 IN BOOL bNeedAck, 1093 IN BOOL bNeedAck,
@@ -1109,7 +1109,7 @@ s_vFillCTSHead (
1109 uCTSFrameLen -= 4; 1109 uCTSFrameLen -= 4;
1110 } 1110 }
1111 1111
1112 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) { 1112 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
1113 if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) { 1113 if (byFBOption != AUTO_FB_NONE && uDMAIdx != TYPE_ATIMDMA && uDMAIdx != TYPE_BEACONDMA) {
1114 // Auto Fall back 1114 // Auto Fall back
1115 PSCTS_FB pBuf = (PSCTS_FB)pvCTS; 1115 PSCTS_FB pBuf = (PSCTS_FB)pvCTS;
@@ -1121,15 +1121,15 @@ s_vFillCTSHead (
1121 1121
1122 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 1122 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
1123 1123
1124 pBuf->wDuration_ba = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data 1124 pBuf->wDuration_ba = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data
1125 pBuf->wDuration_ba += pDevice->wCTSDuration; 1125 pBuf->wDuration_ba += pDevice->wCTSDuration;
1126 pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); 1126 pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba);
1127 //Get CTSDuration_ba_f0 1127 //Get CTSDuration_ba_f0
1128 pBuf->wCTSDuration_ba_f0 = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption); //8:CTSDuration_ba_f0, 1:2.4G, 2,3:2.4G OFDM Data 1128 pBuf->wCTSDuration_ba_f0 = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F0, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //8:CTSDuration_ba_f0, 1:2.4G, 2,3:2.4G OFDM Data
1129 pBuf->wCTSDuration_ba_f0 += pDevice->wCTSDuration; 1129 pBuf->wCTSDuration_ba_f0 += pDevice->wCTSDuration;
1130 pBuf->wCTSDuration_ba_f0 = cpu_to_le16(pBuf->wCTSDuration_ba_f0); 1130 pBuf->wCTSDuration_ba_f0 = cpu_to_le16(pBuf->wCTSDuration_ba_f0);
1131 //Get CTSDuration_ba_f1 1131 //Get CTSDuration_ba_f1
1132 pBuf->wCTSDuration_ba_f1 = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption); //9:CTSDuration_ba_f1, 1:2.4G, 2,3:2.4G OFDM Data 1132 pBuf->wCTSDuration_ba_f1 = (WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA_F1, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption); //9:CTSDuration_ba_f1, 1:2.4G, 2,3:2.4G OFDM Data
1133 pBuf->wCTSDuration_ba_f1 += pDevice->wCTSDuration; 1133 pBuf->wCTSDuration_ba_f1 += pDevice->wCTSDuration;
1134 pBuf->wCTSDuration_ba_f1 = cpu_to_le16(pBuf->wCTSDuration_ba_f1); 1134 pBuf->wCTSDuration_ba_f1 = cpu_to_le16(pBuf->wCTSDuration_ba_f1);
1135 //Get CTS Frame body 1135 //Get CTS Frame body
@@ -1146,7 +1146,7 @@ s_vFillCTSHead (
1146 ); 1146 );
1147 pBuf->wTransmitLength_b = cpu_to_le16(wLen); 1147 pBuf->wTransmitLength_b = cpu_to_le16(wLen);
1148 //Get CTSDuration_ba 1148 //Get CTSDuration_ba
1149 pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktTyp, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data 1149 pBuf->wDuration_ba = cpu_to_le16((WORD)s_uGetRTSCTSDuration(pDevice, CTSDUR_BA, cbFrameLength, byPktType, wCurrentRate, bNeedAck, byFBOption)); //3:CTSDuration_ba, 1:2.4G, 2,3:2.4G OFDM Data
1150 pBuf->wDuration_ba += pDevice->wCTSDuration; 1150 pBuf->wDuration_ba += pDevice->wCTSDuration;
1151 pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba); 1151 pBuf->wDuration_ba = cpu_to_le16(pBuf->wDuration_ba);
1152 1152
@@ -1191,7 +1191,7 @@ static
1191VOID 1191VOID
1192s_vGenerateTxParameter ( 1192s_vGenerateTxParameter (
1193 IN PSDevice pDevice, 1193 IN PSDevice pDevice,
1194 IN BYTE byPktTyp, 1194 IN BYTE byPktType,
1195 IN PVOID pTxBufHead, 1195 IN PVOID pTxBufHead,
1196 IN PVOID pvRrvTime, 1196 IN PVOID pvRrvTime,
1197 IN PVOID pvRTS, 1197 IN PVOID pvRTS,
@@ -1209,7 +1209,7 @@ s_vGenerateTxParameter (
1209 BYTE byFBOption = AUTO_FB_NONE; 1209 BYTE byFBOption = AUTO_FB_NONE;
1210// WORD wCurrentRate = pDevice->wCurrentRate; 1210// WORD wCurrentRate = pDevice->wCurrentRate;
1211 1211
1212 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter...\n"); 1212 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter...\n");
1213 PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead; 1213 PSTxBufHead pFifoHead = (PSTxBufHead)pTxBufHead;
1214 pFifoHead->wReserved = wCurrentRate; 1214 pFifoHead->wReserved = wCurrentRate;
1215 wFifoCtl = pFifoHead->wFIFOCtl; 1215 wFifoCtl = pFifoHead->wFIFOCtl;
@@ -1228,47 +1228,47 @@ s_vGenerateTxParameter (
1228 if (pDevice->bLongHeader) 1228 if (pDevice->bLongHeader)
1229 cbMACHdLen = WLAN_HDR_ADDR3_LEN + 6; 1229 cbMACHdLen = WLAN_HDR_ADDR3_LEN + 6;
1230 1230
1231 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) { 1231 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
1232 1232
1233 if (pvRTS != NULL) { //RTS_need 1233 if (pvRTS != NULL) { //RTS_need
1234 //Fill RsvTime 1234 //Fill RsvTime
1235 if (pvRrvTime) { 1235 if (pvRrvTime) {
1236 PSRrvTime_gRTS pBuf = (PSRrvTime_gRTS)pvRrvTime; 1236 PSRrvTime_gRTS pBuf = (PSRrvTime_gRTS)pvRrvTime;
1237 pBuf->wRTSTxRrvTime_aa = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 2, byPktTyp, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 1:2.4GHz 1237 pBuf->wRTSTxRrvTime_aa = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 1:2.4GHz
1238 pBuf->wRTSTxRrvTime_ba = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 1, byPktTyp, cbFrameSize, wCurrentRate));//1:RTSTxRrvTime_ba, 1:2.4GHz 1238 pBuf->wRTSTxRrvTime_ba = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 1, byPktType, cbFrameSize, wCurrentRate));//1:RTSTxRrvTime_ba, 1:2.4GHz
1239 pBuf->wRTSTxRrvTime_bb = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 0, byPktTyp, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz 1239 pBuf->wRTSTxRrvTime_bb = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz
1240 pBuf->wTxRrvTime_a = cpu_to_le16((WORD) s_uGetTxRsvTime(pDevice, byPktTyp, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM 1240 pBuf->wTxRrvTime_a = cpu_to_le16((WORD) s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM
1241 pBuf->wTxRrvTime_b = cpu_to_le16((WORD) s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK 1241 pBuf->wTxRrvTime_b = cpu_to_le16((WORD) s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK
1242 } 1242 }
1243 //Fill RTS 1243 //Fill RTS
1244 s_vFillRTSHead(pDevice, byPktTyp, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); 1244 s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
1245 } 1245 }
1246 else {//RTS_needless, PCF mode 1246 else {//RTS_needless, PCF mode
1247 1247
1248 //Fill RsvTime 1248 //Fill RsvTime
1249 if (pvRrvTime) { 1249 if (pvRrvTime) {
1250 PSRrvTime_gCTS pBuf = (PSRrvTime_gCTS)pvRrvTime; 1250 PSRrvTime_gCTS pBuf = (PSRrvTime_gCTS)pvRrvTime;
1251 pBuf->wTxRrvTime_a = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, byPktTyp, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM 1251 pBuf->wTxRrvTime_a = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//2.4G OFDM
1252 pBuf->wTxRrvTime_b = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK 1252 pBuf->wTxRrvTime_b = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, pDevice->byTopCCKBasicRate, bNeedACK));//1:CCK
1253 pBuf->wCTSTxRrvTime_ba = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 3, byPktTyp, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz 1253 pBuf->wCTSTxRrvTime_ba = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 3, byPktType, cbFrameSize, wCurrentRate));//3:CTSTxRrvTime_Ba, 1:2.4GHz
1254 } 1254 }
1255 1255
1256 1256
1257 //Fill CTS 1257 //Fill CTS
1258 s_vFillCTSHead(pDevice, uDMAIdx, byPktTyp, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption); 1258 s_vFillCTSHead(pDevice, uDMAIdx, byPktType, pvCTS, cbFrameSize, bNeedACK, bDisCRC, wCurrentRate, byFBOption);
1259 } 1259 }
1260 } 1260 }
1261 else if (byPktTyp == PK_TYPE_11A) { 1261 else if (byPktType == PK_TYPE_11A) {
1262 1262
1263 if (pvRTS != NULL) {//RTS_need, non PCF mode 1263 if (pvRTS != NULL) {//RTS_need, non PCF mode
1264 //Fill RsvTime 1264 //Fill RsvTime
1265 if (pvRrvTime) { 1265 if (pvRrvTime) {
1266 PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime; 1266 PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
1267 pBuf->wRTSTxRrvTime = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 2, byPktTyp, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 0:5GHz 1267 pBuf->wRTSTxRrvTime = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 2, byPktType, cbFrameSize, wCurrentRate));//2:RTSTxRrvTime_aa, 0:5GHz
1268 pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, byPktTyp, cbFrameSize, wCurrentRate, bNeedACK));//0:OFDM 1268 pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, byPktType, cbFrameSize, wCurrentRate, bNeedACK));//0:OFDM
1269 } 1269 }
1270 //Fill RTS 1270 //Fill RTS
1271 s_vFillRTSHead(pDevice, byPktTyp, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); 1271 s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
1272 } 1272 }
1273 else if (pvRTS == NULL) {//RTS_needless, non PCF mode 1273 else if (pvRTS == NULL) {//RTS_needless, non PCF mode
1274 //Fill RsvTime 1274 //Fill RsvTime
@@ -1278,17 +1278,17 @@ s_vGenerateTxParameter (
1278 } 1278 }
1279 } 1279 }
1280 } 1280 }
1281 else if (byPktTyp == PK_TYPE_11B) { 1281 else if (byPktType == PK_TYPE_11B) {
1282 1282
1283 if ((pvRTS != NULL)) {//RTS_need, non PCF mode 1283 if ((pvRTS != NULL)) {//RTS_need, non PCF mode
1284 //Fill RsvTime 1284 //Fill RsvTime
1285 if (pvRrvTime) { 1285 if (pvRrvTime) {
1286 PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime; 1286 PSRrvTime_ab pBuf = (PSRrvTime_ab)pvRrvTime;
1287 pBuf->wRTSTxRrvTime = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 0, byPktTyp, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz 1287 pBuf->wRTSTxRrvTime = cpu_to_le16((WORD)s_uGetRTSCTSRsvTime(pDevice, 0, byPktType, cbFrameSize, wCurrentRate));//0:RTSTxRrvTime_bb, 1:2.4GHz
1288 pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK));//1:CCK 1288 pBuf->wTxRrvTime = cpu_to_le16((WORD)s_uGetTxRsvTime(pDevice, PK_TYPE_11B, cbFrameSize, wCurrentRate, bNeedACK));//1:CCK
1289 } 1289 }
1290 //Fill RTS 1290 //Fill RTS
1291 s_vFillRTSHead(pDevice, byPktTyp, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption); 1291 s_vFillRTSHead(pDevice, byPktType, pvRTS, cbFrameSize, bNeedACK, bDisCRC, psEthHeader, wCurrentRate, byFBOption);
1292 } 1292 }
1293 else { //RTS_needless, non PCF mode 1293 else { //RTS_needless, non PCF mode
1294 //Fill RsvTime 1294 //Fill RsvTime
@@ -1298,7 +1298,7 @@ s_vGenerateTxParameter (
1298 } 1298 }
1299 } 1299 }
1300 } 1300 }
1301 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter END.\n"); 1301 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vGenerateTxParameter END.\n");
1302} 1302}
1303/* 1303/*
1304 PBYTE pbyBuffer,//point to pTxBufHead 1304 PBYTE pbyBuffer,//point to pTxBufHead
@@ -1317,7 +1317,7 @@ s_vFillFragParameter(
1317 ) 1317 )
1318{ 1318{
1319 PSTxBufHead pTxBufHead = (PSTxBufHead) pbyBuffer; 1319 PSTxBufHead pTxBufHead = (PSTxBufHead) pbyBuffer;
1320 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vFillFragParameter...\n"); 1320 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vFillFragParameter...\n");
1321 1321
1322 if (uTxType == TYPE_SYNCDMA) { 1322 if (uTxType == TYPE_SYNCDMA) {
1323 //PSTxSyncDesc ptdCurr = (PSTxSyncDesc)s_pvGetTxDescHead(pDevice, uTxType, uCurIdx); 1323 //PSTxSyncDesc ptdCurr = (PSTxSyncDesc)s_pvGetTxDescHead(pDevice, uTxType, uCurIdx);
@@ -1350,14 +1350,14 @@ s_vFillFragParameter(
1350 1350
1351 pTxBufHead->wFragCtl |= (WORD)wFragType;//0x0001; //0000 0000 0000 0001 1351 pTxBufHead->wFragCtl |= (WORD)wFragType;//0x0001; //0000 0000 0000 0001
1352 1352
1353 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vFillFragParameter END\n"); 1353 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_vFillFragParameter END\n");
1354} 1354}
1355 1355
1356static 1356static
1357UINT 1357UINT
1358s_cbFillTxBufHead ( 1358s_cbFillTxBufHead (
1359 IN PSDevice pDevice, 1359 IN PSDevice pDevice,
1360 IN BYTE byPktTyp, 1360 IN BYTE byPktType,
1361 IN PBYTE pbyTxBufferAddr, 1361 IN PBYTE pbyTxBufferAddr,
1362 IN UINT cbFrameBodySize, 1362 IN UINT cbFrameBodySize,
1363 IN UINT uDMAIdx, 1363 IN UINT uDMAIdx,
@@ -1428,7 +1428,7 @@ s_cbFillTxBufHead (
1428 1428
1429 pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL; 1429 pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;
1430 1430
1431 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_cbFillTxBufHead...\n"); 1431 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_cbFillTxBufHead...\n");
1432 if ((pDevice->eOPMode == OP_MODE_ADHOC) || 1432 if ((pDevice->eOPMode == OP_MODE_ADHOC) ||
1433 (pDevice->eOPMode == OP_MODE_AP)) { 1433 (pDevice->eOPMode == OP_MODE_AP)) {
1434 1434
@@ -1504,7 +1504,7 @@ s_cbFillTxBufHead (
1504 ////////////////////////////////////////////////////// 1504 //////////////////////////////////////////////////////
1505 //Set RrvTime/RTS/CTS Buffer 1505 //Set RrvTime/RTS/CTS Buffer
1506 wTxBufSize = sizeof(STxBufHead); 1506 wTxBufSize = sizeof(STxBufHead);
1507 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) {//802.11g packet 1507 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
1508 1508
1509 if (byFBOption == AUTO_FB_NONE) { 1509 if (byFBOption == AUTO_FB_NONE) {
1510 if (bRTS == TRUE) {//RTS_need 1510 if (bRTS == TRUE) {//RTS_need
@@ -1603,7 +1603,7 @@ s_cbFillTxBufHead (
1603 MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12); 1603 MIC_vAppend((PBYTE)&(psEthHeader->abyDstAddr[0]), 12);
1604 dwMIC_Priority = 0; 1604 dwMIC_Priority = 0;
1605 MIC_vAppend((PBYTE)&dwMIC_Priority, 4); 1605 MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
1606 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1); 1606 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
1607 } 1607 }
1608 1608
1609/////////////////////////////////////////////////////////////////// 1609///////////////////////////////////////////////////////////////////
@@ -1633,15 +1633,15 @@ s_cbFillTxBufHead (
1633 //========================= 1633 //=========================
1634 // Start Fragmentation 1634 // Start Fragmentation
1635 //========================= 1635 //=========================
1636 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Start Fragmentation...\n"); 1636 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Start Fragmentation...\n");
1637 wFragType = FRAGCTL_STAFRAG; 1637 wFragType = FRAGCTL_STAFRAG;
1638 1638
1639 1639
1640 //Fill FIFO,RrvTime,RTS,and CTS 1640 //Fill FIFO,RrvTime,RTS,and CTS
1641 s_vGenerateTxParameter(pDevice, byPktTyp, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, 1641 s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
1642 cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); 1642 cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
1643 //Fill DataHead 1643 //Fill DataHead
1644 uDuration = s_uFillDataHead(pDevice, byPktTyp, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK, 1644 uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK,
1645 uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); 1645 uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate);
1646 // Generate TX MAC Header 1646 // Generate TX MAC Header
1647 vGenerateMACHeader(pDevice, pbyMacHdr, (WORD)uDuration, psEthHeader, bNeedEncrypt, 1647 vGenerateMACHeader(pDevice, pbyMacHdr, (WORD)uDuration, psEthHeader, bNeedEncrypt,
@@ -1700,7 +1700,7 @@ s_cbFillTxBufHead (
1700 uTotalCopyLength += cbFragPayloadSize - cb802_1_H_len; 1700 uTotalCopyLength += cbFragPayloadSize - cb802_1_H_len;
1701 1701
1702 if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) { 1702 if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) {
1703 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Start MIC: %d\n", cbFragPayloadSize); 1703 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Start MIC: %d\n", cbFragPayloadSize);
1704 MIC_vAppend((pbyBuffer + uLength - cb802_1_H_len), cbFragPayloadSize); 1704 MIC_vAppend((pbyBuffer + uLength - cb802_1_H_len), cbFragPayloadSize);
1705 1705
1706 } 1706 }
@@ -1736,16 +1736,16 @@ s_cbFillTxBufHead (
1736 //========================= 1736 //=========================
1737 // Last Fragmentation 1737 // Last Fragmentation
1738 //========================= 1738 //=========================
1739 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Last Fragmentation...\n"); 1739 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Last Fragmentation...\n");
1740 //tmpDescIdx = (uDescIdx + uFragIdx) % pDevice->cbTD[uDMAIdx]; 1740 //tmpDescIdx = (uDescIdx + uFragIdx) % pDevice->cbTD[uDMAIdx];
1741 1741
1742 wFragType = FRAGCTL_ENDFRAG; 1742 wFragType = FRAGCTL_ENDFRAG;
1743 1743
1744 //Fill FIFO,RrvTime,RTS,and CTS 1744 //Fill FIFO,RrvTime,RTS,and CTS
1745 s_vGenerateTxParameter(pDevice, byPktTyp, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, 1745 s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
1746 cbLastFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); 1746 cbLastFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
1747 //Fill DataHead 1747 //Fill DataHead
1748 uDuration = s_uFillDataHead(pDevice, byPktTyp, pvTxDataHd, cbLastFragmentSize, uDMAIdx, bNeedACK, 1748 uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbLastFragmentSize, uDMAIdx, bNeedACK,
1749 uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); 1749 uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate);
1750 1750
1751 // Generate TX MAC Header 1751 // Generate TX MAC Header
@@ -1792,7 +1792,7 @@ s_cbFillTxBufHead (
1792 1792
1793 } 1793 }
1794 if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) { 1794 if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)) {
1795 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen:%d, cbLastFragPayloadSize:%d, uTmpLen:%d\n", 1795 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen:%d, cbLastFragPayloadSize:%d, uTmpLen:%d\n",
1796 uMICFragLen, cbLastFragPayloadSize, uTmpLen); 1796 uMICFragLen, cbLastFragPayloadSize, uTmpLen);
1797 1797
1798 if (bMIC2Frag == FALSE) { 1798 if (bMIC2Frag == FALSE) {
@@ -1801,12 +1801,12 @@ s_cbFillTxBufHead (
1801 pdwMIC_L = (PDWORD)(pbyBuffer + uLength + uTmpLen); 1801 pdwMIC_L = (PDWORD)(pbyBuffer + uLength + uTmpLen);
1802 pdwMIC_R = (PDWORD)(pbyBuffer + uLength + uTmpLen + 4); 1802 pdwMIC_R = (PDWORD)(pbyBuffer + uLength + uTmpLen + 4);
1803 MIC_vGetMIC(pdwMIC_L, pdwMIC_R); 1803 MIC_vGetMIC(pdwMIC_L, pdwMIC_R);
1804 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Last MIC:%lX, %lX\n", *pdwMIC_L, *pdwMIC_R); 1804 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Last MIC:%lX, %lX\n", *pdwMIC_L, *pdwMIC_R);
1805 } else { 1805 } else {
1806 if (uMICFragLen >= 4) { 1806 if (uMICFragLen >= 4) {
1807 MEMvCopy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)), 1807 MEMvCopy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)),
1808 (cbMIClen - uMICFragLen)); 1808 (cbMIClen - uMICFragLen));
1809 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen >= 4: %X, %d\n", 1809 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen >= 4: %X, %d\n",
1810 *(PBYTE)((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)), 1810 *(PBYTE)((PBYTE)&dwSafeMIC_R + (uMICFragLen - 4)),
1811 (cbMIClen - uMICFragLen)); 1811 (cbMIClen - uMICFragLen));
1812 1812
@@ -1814,15 +1814,15 @@ s_cbFillTxBufHead (
1814 MEMvCopy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_L + uMICFragLen), 1814 MEMvCopy((pbyBuffer + uLength), ((PBYTE)&dwSafeMIC_L + uMICFragLen),
1815 (4 - uMICFragLen)); 1815 (4 - uMICFragLen));
1816 MEMvCopy((pbyBuffer + uLength + (4 - uMICFragLen)), &dwSafeMIC_R, 4); 1816 MEMvCopy((pbyBuffer + uLength + (4 - uMICFragLen)), &dwSafeMIC_R, 4);
1817 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen < 4: %X, %d\n", 1817 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"LAST: uMICFragLen < 4: %X, %d\n",
1818 *(PBYTE)((PBYTE)&dwSafeMIC_R + uMICFragLen - 4), 1818 *(PBYTE)((PBYTE)&dwSafeMIC_R + uMICFragLen - 4),
1819 (cbMIClen - uMICFragLen)); 1819 (cbMIClen - uMICFragLen));
1820 } 1820 }
1821 /* 1821 /*
1822 for (ii = 0; ii < cbLastFragPayloadSize + 8 + 24; ii++) { 1822 for (ii = 0; ii < cbLastFragPayloadSize + 8 + 24; ii++) {
1823 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength) + ii - 8 - 24))); 1823 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength) + ii - 8 - 24)));
1824 } 1824 }
1825 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n\n"); 1825 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n\n");
1826 */ 1826 */
1827 } 1827 }
1828 MIC_vUnInit(); 1828 MIC_vUnInit();
@@ -1866,16 +1866,16 @@ s_cbFillTxBufHead (
1866 //========================= 1866 //=========================
1867 // Middle Fragmentation 1867 // Middle Fragmentation
1868 //========================= 1868 //=========================
1869 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Middle Fragmentation...\n"); 1869 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Middle Fragmentation...\n");
1870 //tmpDescIdx = (uDescIdx + uFragIdx) % pDevice->cbTD[uDMAIdx]; 1870 //tmpDescIdx = (uDescIdx + uFragIdx) % pDevice->cbTD[uDMAIdx];
1871 1871
1872 wFragType = FRAGCTL_MIDFRAG; 1872 wFragType = FRAGCTL_MIDFRAG;
1873 1873
1874 //Fill FIFO,RrvTime,RTS,and CTS 1874 //Fill FIFO,RrvTime,RTS,and CTS
1875 s_vGenerateTxParameter(pDevice, byPktTyp, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, 1875 s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
1876 cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); 1876 cbFragmentSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
1877 //Fill DataHead 1877 //Fill DataHead
1878 uDuration = s_uFillDataHead(pDevice, byPktTyp, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK, 1878 uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFragmentSize, uDMAIdx, bNeedACK,
1879 uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate); 1879 uFragIdx, cbLastFragmentSize, uMACfragNum, byFBOption, pDevice->wCurrentRate);
1880 1880
1881 // Generate TX MAC Header 1881 // Generate TX MAC Header
@@ -1939,23 +1939,23 @@ s_cbFillTxBufHead (
1939 dwSafeMIC_L = *pdwMIC_L; 1939 dwSafeMIC_L = *pdwMIC_L;
1940 dwSafeMIC_R = *pdwMIC_R; 1940 dwSafeMIC_R = *pdwMIC_R;
1941 1941
1942 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIDDLE: uMICFragLen:%d, cbFragPayloadSize:%d, uTmpLen:%d\n", 1942 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIDDLE: uMICFragLen:%d, cbFragPayloadSize:%d, uTmpLen:%d\n",
1943 uMICFragLen, cbFragPayloadSize, uTmpLen); 1943 uMICFragLen, cbFragPayloadSize, uTmpLen);
1944 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Fill MIC in Middle frag [%d]\n", uMICFragLen); 1944 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Fill MIC in Middle frag [%d]\n", uMICFragLen);
1945 /* 1945 /*
1946 for (ii = 0; ii < uMICFragLen; ii++) { 1946 for (ii = 0; ii < uMICFragLen; ii++) {
1947 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength + uTmpLen) + ii))); 1947 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength + uTmpLen) + ii)));
1948 } 1948 }
1949 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 1949 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
1950 */ 1950 */
1951 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get MIC:%lX, %lX\n", *pdwMIC_L, *pdwMIC_R); 1951 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get MIC:%lX, %lX\n", *pdwMIC_L, *pdwMIC_R);
1952 } 1952 }
1953 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Middle frag len: %d\n", uTmpLen); 1953 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Middle frag len: %d\n", uTmpLen);
1954 /* 1954 /*
1955 for (ii = 0; ii < uTmpLen; ii++) { 1955 for (ii = 0; ii < uTmpLen; ii++) {
1956 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength) + ii))); 1956 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength) + ii)));
1957 } 1957 }
1958 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n\n"); 1958 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n\n");
1959 */ 1959 */
1960 1960
1961 } else { 1961 } else {
@@ -1994,18 +1994,18 @@ s_cbFillTxBufHead (
1994 //========================= 1994 //=========================
1995 // No Fragmentation 1995 // No Fragmentation
1996 //========================= 1996 //=========================
1997 //DEVICE_PRTGRP03(("No Fragmentation...\n")); 1997 //DBG_PRTGRP03(("No Fragmentation...\n"));
1998 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No Fragmentation...\n"); 1998 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No Fragmentation...\n");
1999 wFragType = FRAGCTL_NONFRAG; 1999 wFragType = FRAGCTL_NONFRAG;
2000 2000
2001 //Set FragCtl in TxBufferHead 2001 //Set FragCtl in TxBufferHead
2002 psTxBufHd->wFragCtl |= (WORD)wFragType; 2002 psTxBufHd->wFragCtl |= (WORD)wFragType;
2003 2003
2004 //Fill FIFO,RrvTime,RTS,and CTS 2004 //Fill FIFO,RrvTime,RTS,and CTS
2005 s_vGenerateTxParameter(pDevice, byPktTyp, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS, 2005 s_vGenerateTxParameter(pDevice, byPktType, (PVOID)psTxBufHd, pvRrvTime, pvRTS, pvCTS,
2006 cbFrameSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate); 2006 cbFrameSize, bNeedACK, uDMAIdx, psEthHeader, pDevice->wCurrentRate);
2007 //Fill DataHead 2007 //Fill DataHead
2008 uDuration = s_uFillDataHead(pDevice, byPktTyp, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK, 2008 uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,
2009 0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate); 2009 0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate);
2010 2010
2011 // Generate TX MAC Header 2011 // Generate TX MAC Header
@@ -2043,7 +2043,7 @@ s_cbFillTxBufHead (
2043 //--------------------------- 2043 //---------------------------
2044 //Fill MICHDR 2044 //Fill MICHDR
2045 //if (pDevice->bAES) { 2045 //if (pDevice->bAES) {
2046 // DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Fill MICHDR...\n"); 2046 // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Fill MICHDR...\n");
2047 // s_vFillMICHDR(pDevice, (PBYTE)pMICHDR, pbyMacHdr, (WORD)cbFrameBodySize); 2047 // s_vFillMICHDR(pDevice, (PBYTE)pMICHDR, pbyMacHdr, (WORD)cbFrameBodySize);
2048 //} 2048 //}
2049 2049
@@ -2063,12 +2063,12 @@ s_cbFillTxBufHead (
2063 2063
2064 if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)){ 2064 if ((bNeedEncrypt == TRUE) && (pTransmitKey != NULL) && (pTransmitKey->byCipherSuite == KEY_CTL_TKIP)){
2065 2065
2066 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Length:%d, %d\n", cbFrameBodySize - cb802_1_H_len, uLength); 2066 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Length:%d, %d\n", cbFrameBodySize - cb802_1_H_len, uLength);
2067 /* 2067 /*
2068 for (ii = 0; ii < (cbFrameBodySize - cb802_1_H_len); ii++) { 2068 for (ii = 0; ii < (cbFrameBodySize - cb802_1_H_len); ii++) {
2069 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength) + ii))); 2069 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *((PBYTE)((pbyBuffer + uLength) + ii)));
2070 } 2070 }
2071 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 2071 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
2072 */ 2072 */
2073 2073
2074 MIC_vAppend((pbyBuffer + uLength - cb802_1_H_len), cbFrameBodySize); 2074 MIC_vAppend((pbyBuffer + uLength - cb802_1_H_len), cbFrameBodySize);
@@ -2086,14 +2086,14 @@ s_cbFillTxBufHead (
2086 pDevice->bTxMICFail = FALSE; 2086 pDevice->bTxMICFail = FALSE;
2087 } 2087 }
2088 2088
2089 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize); 2089 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize);
2090 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderLength, uPadding, cbIVlen); 2090 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderLength, uPadding, cbIVlen);
2091 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R); 2091 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R);
2092/* 2092/*
2093 for (ii = 0; ii < 8; ii++) { 2093 for (ii = 0; ii < 8; ii++) {
2094 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *(((PBYTE)(pdwMIC_L) + ii))); 2094 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%02x ", *(((PBYTE)(pdwMIC_L) + ii)));
2095 } 2095 }
2096 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n"); 2096 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"\n");
2097*/ 2097*/
2098 2098
2099 } 2099 }
@@ -2121,12 +2121,12 @@ s_cbFillTxBufHead (
2121 pDevice->iTDUsed[uDMAIdx]++; 2121 pDevice->iTDUsed[uDMAIdx]++;
2122 2122
2123 2123
2124// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" ptdCurr->m_dwReserved0[%d] ptdCurr->m_dwReserved1[%d].\n", ptdCurr->pTDInfo->dwReqCount, ptdCurr->pTDInfo->dwHeaderLength); 2124// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" ptdCurr->m_dwReserved0[%d] ptdCurr->m_dwReserved1[%d].\n", ptdCurr->pTDInfo->dwReqCount, ptdCurr->pTDInfo->dwHeaderLength);
2125// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cbHeaderLength[%d]\n", cbHeaderLength); 2125// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cbHeaderLength[%d]\n", cbHeaderLength);
2126 2126
2127 } 2127 }
2128 *puMACfragNum = uMACfragNum; 2128 *puMACfragNum = uMACfragNum;
2129 //DEVICE_PRTGRP03(("s_cbFillTxBufHead END\n")); 2129 //DBG_PRTGRP03(("s_cbFillTxBufHead END\n"));
2130 return cbHeaderLength; 2130 return cbHeaderLength;
2131} 2131}
2132 2132
@@ -2134,7 +2134,7 @@ s_cbFillTxBufHead (
2134VOID 2134VOID
2135vGenerateFIFOHeader ( 2135vGenerateFIFOHeader (
2136 IN PSDevice pDevice, 2136 IN PSDevice pDevice,
2137 IN BYTE byPktTyp, 2137 IN BYTE byPktType,
2138 IN PBYTE pbyTxBufferAddr, 2138 IN PBYTE pbyTxBufferAddr,
2139 IN BOOL bNeedEncrypt, 2139 IN BOOL bNeedEncrypt,
2140 IN UINT cbPayloadSize, 2140 IN UINT cbPayloadSize,
@@ -2206,16 +2206,16 @@ vGenerateFIFOHeader (
2206 pTxBufHead->wFragCtl |= cpu_to_le16((WORD)(cbMacHdLen << 10)); 2206 pTxBufHead->wFragCtl |= cpu_to_le16((WORD)(cbMacHdLen << 10));
2207 2207
2208 //Set packet type 2208 //Set packet type
2209 if (byPktTyp == PK_TYPE_11A) {//0000 0000 0000 0000 2209 if (byPktType == PK_TYPE_11A) {//0000 0000 0000 0000
2210 ; 2210 ;
2211 } 2211 }
2212 else if (byPktTyp == PK_TYPE_11B) {//0000 0001 0000 0000 2212 else if (byPktType == PK_TYPE_11B) {//0000 0001 0000 0000
2213 pTxBufHead->wFIFOCtl |= FIFOCTL_11B; 2213 pTxBufHead->wFIFOCtl |= FIFOCTL_11B;
2214 } 2214 }
2215 else if (byPktTyp == PK_TYPE_11GB) {//0000 0010 0000 0000 2215 else if (byPktType == PK_TYPE_11GB) {//0000 0010 0000 0000
2216 pTxBufHead->wFIFOCtl |= FIFOCTL_11GB; 2216 pTxBufHead->wFIFOCtl |= FIFOCTL_11GB;
2217 } 2217 }
2218 else if (byPktTyp == PK_TYPE_11GA) {//0000 0011 0000 0000 2218 else if (byPktType == PK_TYPE_11GA) {//0000 0011 0000 0000
2219 pTxBufHead->wFIFOCtl |= FIFOCTL_11GA; 2219 pTxBufHead->wFIFOCtl |= FIFOCTL_11GA;
2220 } 2220 }
2221 //Set FIFOCTL_GrpAckPolicy 2221 //Set FIFOCTL_GrpAckPolicy
@@ -2273,7 +2273,7 @@ vGenerateFIFOHeader (
2273 if(pDevice->bEnableHostWEP) 2273 if(pDevice->bEnableHostWEP)
2274 pTxBufHead->wFragCtl &= ~(FRAGCTL_TKIP | FRAGCTL_LEGACY |FRAGCTL_AES); 2274 pTxBufHead->wFragCtl &= ~(FRAGCTL_TKIP | FRAGCTL_LEGACY |FRAGCTL_AES);
2275*/ 2275*/
2276 *pcbHeaderSize = s_cbFillTxBufHead(pDevice, byPktTyp, pbyTxBufferAddr, cbPayloadSize, 2276 *pcbHeaderSize = s_cbFillTxBufHead(pDevice, byPktType, pbyTxBufferAddr, cbPayloadSize,
2277 uDMAIdx, pHeadTD, psEthHeader, pPacket, bNeedEncrypt, 2277 uDMAIdx, pHeadTD, psEthHeader, pPacket, bNeedEncrypt,
2278 pTransmitKey, uNodeIndex, puMACfragNum); 2278 pTransmitKey, uNodeIndex, puMACfragNum);
2279 2279
@@ -2378,7 +2378,7 @@ vGenerateMACHeader (
2378CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { 2378CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2379 2379
2380 PSTxDesc pFrstTD; 2380 PSTxDesc pFrstTD;
2381 BYTE byPktTyp; 2381 BYTE byPktType;
2382 PBYTE pbyTxBufferAddr; 2382 PBYTE pbyTxBufferAddr;
2383 PVOID pvRTS; 2383 PVOID pvRTS;
2384 PSCTS pCTS; 2384 PSCTS pCTS;
@@ -2419,10 +2419,10 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2419 2419
2420 if (pDevice->eCurrentPHYType == PHY_TYPE_11A) { 2420 if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
2421 wCurrentRate = RATE_6M; 2421 wCurrentRate = RATE_6M;
2422 byPktTyp = PK_TYPE_11A; 2422 byPktType = PK_TYPE_11A;
2423 } else { 2423 } else {
2424 wCurrentRate = RATE_1M; 2424 wCurrentRate = RATE_1M;
2425 byPktTyp = PK_TYPE_11B; 2425 byPktType = PK_TYPE_11B;
2426 } 2426 }
2427 2427
2428 // SetPower will cause error power TX state for OFDM Date packet in TX buffer. 2428 // SetPower will cause error power TX state for OFDM Date packet in TX buffer.
@@ -2440,21 +2440,21 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2440 if (pDevice->byFOETuning) { 2440 if (pDevice->byFOETuning) {
2441 if ((pPacket->p80211Header->sA3.wFrameCtl & TYPE_DATE_NULL) == TYPE_DATE_NULL) { 2441 if ((pPacket->p80211Header->sA3.wFrameCtl & TYPE_DATE_NULL) == TYPE_DATE_NULL) {
2442 wCurrentRate = RATE_24M; 2442 wCurrentRate = RATE_24M;
2443 byPktTyp = PK_TYPE_11GA; 2443 byPktType = PK_TYPE_11GA;
2444 } 2444 }
2445 } 2445 }
2446 2446
2447 //Set packet type 2447 //Set packet type
2448 if (byPktTyp == PK_TYPE_11A) {//0000 0000 0000 0000 2448 if (byPktType == PK_TYPE_11A) {//0000 0000 0000 0000
2449 pTxBufHead->wFIFOCtl = 0; 2449 pTxBufHead->wFIFOCtl = 0;
2450 } 2450 }
2451 else if (byPktTyp == PK_TYPE_11B) {//0000 0001 0000 0000 2451 else if (byPktType == PK_TYPE_11B) {//0000 0001 0000 0000
2452 pTxBufHead->wFIFOCtl |= FIFOCTL_11B; 2452 pTxBufHead->wFIFOCtl |= FIFOCTL_11B;
2453 } 2453 }
2454 else if (byPktTyp == PK_TYPE_11GB) {//0000 0010 0000 0000 2454 else if (byPktType == PK_TYPE_11GB) {//0000 0010 0000 0000
2455 pTxBufHead->wFIFOCtl |= FIFOCTL_11GB; 2455 pTxBufHead->wFIFOCtl |= FIFOCTL_11GB;
2456 } 2456 }
2457 else if (byPktTyp == PK_TYPE_11GA) {//0000 0011 0000 0000 2457 else if (byPktType == PK_TYPE_11GA) {//0000 0011 0000 0000
2458 pTxBufHead->wFIFOCtl |= FIFOCTL_11GA; 2458 pTxBufHead->wFIFOCtl |= FIFOCTL_11GA;
2459 } 2459 }
2460 2460
@@ -2536,7 +2536,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2536 //the rest of pTxBufHead->wFragCtl:FragTyp will be set later in s_vFillFragParameter() 2536 //the rest of pTxBufHead->wFragCtl:FragTyp will be set later in s_vFillFragParameter()
2537 2537
2538 //Set RrvTime/RTS/CTS Buffer 2538 //Set RrvTime/RTS/CTS Buffer
2539 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) {//802.11g packet 2539 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
2540 2540
2541 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize); 2541 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
2542 pMICHDR = NULL; 2542 pMICHDR = NULL;
@@ -2565,11 +2565,11 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2565 2565
2566 2566
2567 //Fill FIFO,RrvTime,RTS,and CTS 2567 //Fill FIFO,RrvTime,RTS,and CTS
2568 s_vGenerateTxParameter(pDevice, byPktTyp, pbyTxBufferAddr, pvRrvTime, pvRTS, pCTS, 2568 s_vGenerateTxParameter(pDevice, byPktType, pbyTxBufferAddr, pvRrvTime, pvRTS, pCTS,
2569 cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, wCurrentRate); 2569 cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, wCurrentRate);
2570 2570
2571 //Fill DataHead 2571 //Fill DataHead
2572 uDuration = s_uFillDataHead(pDevice, byPktTyp, pvTxDataHd, cbFrameSize, TYPE_TXDMA0, bNeedACK, 2572 uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, TYPE_TXDMA0, bNeedACK,
2573 0, 0, 1, AUTO_FB_NONE, wCurrentRate); 2573 0, 0, 1, AUTO_FB_NONE, wCurrentRate);
2574 2574
2575 pMACHeader = (PS802_11Header) (pbyTxBufferAddr + cbHeaderSize); 2575 pMACHeader = (PS802_11Header) (pbyTxBufferAddr + cbHeaderSize);
@@ -2606,11 +2606,11 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2606 if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == FALSE) { 2606 if (KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, PAIRWISE_KEY, &pTransmitKey) == FALSE) {
2607 // get group key 2607 // get group key
2608 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == TRUE) { 2608 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == TRUE) {
2609 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get GTK.\n"); 2609 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get GTK.\n");
2610 break; 2610 break;
2611 } 2611 }
2612 } else { 2612 } else {
2613 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get PTK.\n"); 2613 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get PTK.\n");
2614 break; 2614 break;
2615 } 2615 }
2616 } 2616 }
@@ -2618,9 +2618,9 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2618 pbyBSSID = pDevice->abyBroadcastAddr; 2618 pbyBSSID = pDevice->abyBroadcastAddr;
2619 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) { 2619 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) {
2620 pTransmitKey = NULL; 2620 pTransmitKey = NULL;
2621 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KEY is NULL. OP Mode[%d]\n", pDevice->eOPMode); 2621 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"KEY is NULL. OP Mode[%d]\n", pDevice->eOPMode);
2622 } else { 2622 } else {
2623 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get GTK.\n"); 2623 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Get GTK.\n");
2624 } 2624 }
2625 } while(FALSE); 2625 } while(FALSE);
2626 //Fill TXKEY 2626 //Fill TXKEY
@@ -2647,7 +2647,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2647 // This will cause AID-field of PS-POLL packet be incorrect (Because PS-POLL's AID field is 2647 // This will cause AID-field of PS-POLL packet be incorrect (Because PS-POLL's AID field is
2648 // in the same place of other packet's Duration-field). 2648 // in the same place of other packet's Duration-field).
2649 // And it will cause Cisco-AP to issue Disassociation-packet 2649 // And it will cause Cisco-AP to issue Disassociation-packet
2650 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) { 2650 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
2651 ((PSTxDataHead_g)pvTxDataHd)->wDuration_a = cpu_to_le16(pPacket->p80211Header->sA2.wDurationID); 2651 ((PSTxDataHead_g)pvTxDataHd)->wDuration_a = cpu_to_le16(pPacket->p80211Header->sA2.wDurationID);
2652 ((PSTxDataHead_g)pvTxDataHd)->wDuration_b = cpu_to_le16(pPacket->p80211Header->sA2.wDurationID); 2652 ((PSTxDataHead_g)pvTxDataHd)->wDuration_b = cpu_to_le16(pPacket->p80211Header->sA2.wDurationID);
2653 } else { 2653 } else {
@@ -2677,7 +2677,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2677 pDevice->iTDUsed[TYPE_TXDMA0]++; 2677 pDevice->iTDUsed[TYPE_TXDMA0]++;
2678 2678
2679 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 1) { 2679 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 1) {
2680 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " available td0 <= 1\n"); 2680 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " available td0 <= 1\n");
2681 } 2681 }
2682 2682
2683 pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next; 2683 pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next;
@@ -2699,7 +2699,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2699 2699
2700CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { 2700CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2701 2701
2702 BYTE byPktTyp; 2702 BYTE byPktType;
2703 PBYTE pbyBuffer = (PBYTE)pDevice->tx_beacon_bufs; 2703 PBYTE pbyBuffer = (PBYTE)pDevice->tx_beacon_bufs;
2704 UINT cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN; 2704 UINT cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN;
2705 UINT cbHeaderSize = 0; 2705 UINT cbHeaderSize = 0;
@@ -2715,10 +2715,10 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2715 2715
2716 if (pDevice->eCurrentPHYType == PHY_TYPE_11A) { 2716 if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
2717 wCurrentRate = RATE_6M; 2717 wCurrentRate = RATE_6M;
2718 byPktTyp = PK_TYPE_11A; 2718 byPktType = PK_TYPE_11A;
2719 } else { 2719 } else {
2720 wCurrentRate = RATE_2M; 2720 wCurrentRate = RATE_2M;
2721 byPktTyp = PK_TYPE_11B; 2721 byPktType = PK_TYPE_11B;
2722 } 2722 }
2723 2723
2724 //Set Preamble type always long 2724 //Set Preamble type always long
@@ -2730,17 +2730,17 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2730 2730
2731 2731
2732 //Set packet type & Get Duration 2732 //Set packet type & Get Duration
2733 if (byPktTyp == PK_TYPE_11A) {//0000 0000 0000 0000 2733 if (byPktType == PK_TYPE_11A) {//0000 0000 0000 0000
2734 pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameSize, byPktTyp, 2734 pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_A, cbFrameSize, byPktType,
2735 wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE)); 2735 wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE));
2736 } 2736 }
2737 else if (byPktTyp == PK_TYPE_11B) {//0000 0001 0000 0000 2737 else if (byPktType == PK_TYPE_11B) {//0000 0001 0000 0000
2738 pTxBufHead->wFIFOCtl |= FIFOCTL_11B; 2738 pTxBufHead->wFIFOCtl |= FIFOCTL_11B;
2739 pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameSize, byPktTyp, 2739 pTxDataHead->wDuration = cpu_to_le16((WORD)s_uGetDataDuration(pDevice, DATADUR_B, cbFrameSize, byPktType,
2740 wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE)); 2740 wCurrentRate, FALSE, 0, 0, 1, AUTO_FB_NONE));
2741 } 2741 }
2742 2742
2743 BBvCaculateParameter(pDevice, cbFrameSize, wCurrentRate, byPktTyp, 2743 BBvCaculateParameter(pDevice, cbFrameSize, wCurrentRate, byPktType,
2744 (PWORD)&(wLen), (PBYTE)&(pTxDataHead->byServiceField), (PBYTE)&(pTxDataHead->bySignalField) 2744 (PWORD)&(wLen), (PBYTE)&(pTxDataHead->byServiceField), (PBYTE)&(pTxDataHead->bySignalField)
2745 ); 2745 );
2746 pTxDataHead->wTransmitLength = cpu_to_le16(wLen); 2746 pTxDataHead->wTransmitLength = cpu_to_le16(wLen);
@@ -2867,7 +2867,7 @@ VOID
2867vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDULen) { 2867vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDULen) {
2868 2868
2869 PSTxDesc pFrstTD; 2869 PSTxDesc pFrstTD;
2870 BYTE byPktTyp; 2870 BYTE byPktType;
2871 PBYTE pbyTxBufferAddr; 2871 PBYTE pbyTxBufferAddr;
2872 PVOID pvRTS; 2872 PVOID pvRTS;
2873 PVOID pvCTS; 2873 PVOID pvCTS;
@@ -2931,10 +2931,10 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
2931 2931
2932 if (pDevice->eCurrentPHYType == PHY_TYPE_11A) { 2932 if (pDevice->eCurrentPHYType == PHY_TYPE_11A) {
2933 wCurrentRate = RATE_6M; 2933 wCurrentRate = RATE_6M;
2934 byPktTyp = PK_TYPE_11A; 2934 byPktType = PK_TYPE_11A;
2935 } else { 2935 } else {
2936 wCurrentRate = RATE_1M; 2936 wCurrentRate = RATE_1M;
2937 byPktTyp = PK_TYPE_11B; 2937 byPktType = PK_TYPE_11B;
2938 } 2938 }
2939 2939
2940 // SetPower will cause error power TX state for OFDM Date packet in TX buffer. 2940 // SetPower will cause error power TX state for OFDM Date packet in TX buffer.
@@ -2952,23 +2952,23 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
2952 if (pDevice->byFOETuning) { 2952 if (pDevice->byFOETuning) {
2953 if ((p80211Header->sA3.wFrameCtl & TYPE_DATE_NULL) == TYPE_DATE_NULL) { 2953 if ((p80211Header->sA3.wFrameCtl & TYPE_DATE_NULL) == TYPE_DATE_NULL) {
2954 wCurrentRate = RATE_24M; 2954 wCurrentRate = RATE_24M;
2955 byPktTyp = PK_TYPE_11GA; 2955 byPktType = PK_TYPE_11GA;
2956 } 2956 }
2957 } 2957 }
2958 2958
2959 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vDMA0_tx_80211: p80211Header->sA3.wFrameCtl = %x \n", p80211Header->sA3.wFrameCtl); 2959 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vDMA0_tx_80211: p80211Header->sA3.wFrameCtl = %x \n", p80211Header->sA3.wFrameCtl);
2960 2960
2961 //Set packet type 2961 //Set packet type
2962 if (byPktTyp == PK_TYPE_11A) {//0000 0000 0000 0000 2962 if (byPktType == PK_TYPE_11A) {//0000 0000 0000 0000
2963 pTxBufHead->wFIFOCtl = 0; 2963 pTxBufHead->wFIFOCtl = 0;
2964 } 2964 }
2965 else if (byPktTyp == PK_TYPE_11B) {//0000 0001 0000 0000 2965 else if (byPktType == PK_TYPE_11B) {//0000 0001 0000 0000
2966 pTxBufHead->wFIFOCtl |= FIFOCTL_11B; 2966 pTxBufHead->wFIFOCtl |= FIFOCTL_11B;
2967 } 2967 }
2968 else if (byPktTyp == PK_TYPE_11GB) {//0000 0010 0000 0000 2968 else if (byPktType == PK_TYPE_11GB) {//0000 0010 0000 0000
2969 pTxBufHead->wFIFOCtl |= FIFOCTL_11GB; 2969 pTxBufHead->wFIFOCtl |= FIFOCTL_11GB;
2970 } 2970 }
2971 else if (byPktTyp == PK_TYPE_11GA) {//0000 0011 0000 0000 2971 else if (byPktType == PK_TYPE_11GA) {//0000 0011 0000 0000
2972 pTxBufHead->wFIFOCtl |= FIFOCTL_11GA; 2972 pTxBufHead->wFIFOCtl |= FIFOCTL_11GA;
2973 } 2973 }
2974 2974
@@ -3078,7 +3078,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
3078 //the rest of pTxBufHead->wFragCtl:FragTyp will be set later in s_vFillFragParameter() 3078 //the rest of pTxBufHead->wFragCtl:FragTyp will be set later in s_vFillFragParameter()
3079 3079
3080 3080
3081 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) {//802.11g packet 3081 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {//802.11g packet
3082 3082
3083 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize); 3083 pvRrvTime = (PSRrvTime_gCTS) (pbyTxBufferAddr + wTxBufSize);
3084 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS)); 3084 pMICHDR = (PSMICHDRHead) (pbyTxBufferAddr + wTxBufSize + sizeof(SRrvTime_gCTS));
@@ -3109,11 +3109,11 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
3109 3109
3110 3110
3111 //Fill FIFO,RrvTime,RTS,and CTS 3111 //Fill FIFO,RrvTime,RTS,and CTS
3112 s_vGenerateTxParameter(pDevice, byPktTyp, pbyTxBufferAddr, pvRrvTime, pvRTS, pvCTS, 3112 s_vGenerateTxParameter(pDevice, byPktType, pbyTxBufferAddr, pvRrvTime, pvRTS, pvCTS,
3113 cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, wCurrentRate); 3113 cbFrameSize, bNeedACK, TYPE_TXDMA0, &sEthHeader, wCurrentRate);
3114 3114
3115 //Fill DataHead 3115 //Fill DataHead
3116 uDuration = s_uFillDataHead(pDevice, byPktTyp, pvTxDataHd, cbFrameSize, TYPE_TXDMA0, bNeedACK, 3116 uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, TYPE_TXDMA0, bNeedACK,
3117 0, 0, 1, AUTO_FB_NONE, wCurrentRate); 3117 0, 0, 1, AUTO_FB_NONE, wCurrentRate);
3118 3118
3119 pMACHeader = (PS802_11Header) (pbyTxBufferAddr + cbHeaderSize); 3119 pMACHeader = (PS802_11Header) (pbyTxBufferAddr + cbHeaderSize);
@@ -3173,7 +3173,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
3173 MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12); 3173 MIC_vAppend((PBYTE)&(sEthHeader.abyDstAddr[0]), 12);
3174 dwMIC_Priority = 0; 3174 dwMIC_Priority = 0;
3175 MIC_vAppend((PBYTE)&dwMIC_Priority, 4); 3175 MIC_vAppend((PBYTE)&dwMIC_Priority, 4);
3176 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1); 3176 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"DMA0_tx_8021:MIC KEY: %lX, %lX\n", dwMICKey0, dwMICKey1);
3177 3177
3178 uLength = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen; 3178 uLength = cbHeaderSize + cbMacHdLen + uPadding + cbIVlen;
3179 3179
@@ -3191,9 +3191,9 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
3191 pDevice->bTxMICFail = FALSE; 3191 pDevice->bTxMICFail = FALSE;
3192 } 3192 }
3193 3193
3194 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize); 3194 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"uLength: %d, %d\n", uLength, cbFrameBodySize);
3195 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderSize, uPadding, cbIVlen); 3195 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"cbReqCount:%d, %d, %d, %d\n", cbReqCount, cbHeaderSize, uPadding, cbIVlen);
3196 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R); 3196 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"MIC:%lx, %lx\n", *pdwMIC_L, *pdwMIC_R);
3197 3197
3198 } 3198 }
3199 3199
@@ -3223,7 +3223,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
3223 // This will cause AID-field of PS-POLL packet be incorrect (Because PS-POLL's AID field is 3223 // This will cause AID-field of PS-POLL packet be incorrect (Because PS-POLL's AID field is
3224 // in the same place of other packet's Duration-field). 3224 // in the same place of other packet's Duration-field).
3225 // And it will cause Cisco-AP to issue Disassociation-packet 3225 // And it will cause Cisco-AP to issue Disassociation-packet
3226 if (byPktTyp == PK_TYPE_11GB || byPktTyp == PK_TYPE_11GA) { 3226 if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
3227 ((PSTxDataHead_g)pvTxDataHd)->wDuration_a = cpu_to_le16(p80211Header->sA2.wDurationID); 3227 ((PSTxDataHead_g)pvTxDataHd)->wDuration_a = cpu_to_le16(p80211Header->sA2.wDurationID);
3228 ((PSTxDataHead_g)pvTxDataHd)->wDuration_b = cpu_to_le16(p80211Header->sA2.wDurationID); 3228 ((PSTxDataHead_g)pvTxDataHd)->wDuration_b = cpu_to_le16(p80211Header->sA2.wDurationID);
3229 } else { 3229 } else {
@@ -3255,7 +3255,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, PBYTE pbMPDU, UINT cbMPDU
3255 pDevice->iTDUsed[TYPE_TXDMA0]++; 3255 pDevice->iTDUsed[TYPE_TXDMA0]++;
3256 3256
3257 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 1) { 3257 if (AVAIL_TD(pDevice, TYPE_TXDMA0) <= 1) {
3258 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " available td0 <= 1\n"); 3258 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " available td0 <= 1\n");
3259 } 3259 }
3260 3260
3261 pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next; 3261 pDevice->apCurrTD[TYPE_TXDMA0] = pFrstTD->next;
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index 92563bd011b..d97d97d1e6c 100644
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -274,10 +274,10 @@ s_vProbeChannel(
274 if (pTxPacket != NULL ){ 274 if (pTxPacket != NULL ){
275 for (ii = 0; ii < 2 ; ii++) { 275 for (ii = 0; ii < 2 ; ii++) {
276 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { 276 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
277 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending fail.. \n"); 277 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending fail.. \n");
278 } 278 }
279 else { 279 else {
280 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is sending.. \n"); 280 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is sending.. \n");
281 } 281 }
282 } 282 }
283 } 283 }
@@ -409,7 +409,7 @@ vCommandTimer (
409 return; 409 return;
410 } 410 }
411 411
412 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_SCAN_START\n"); 412 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_SCAN_START\n");
413 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID; 413 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID;
414 // wait all Data TD complete 414 // wait all Data TD complete
415 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){ 415 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){
@@ -429,7 +429,7 @@ vCommandTimer (
429 // Set Baseband's sensitivity back. 429 // Set Baseband's sensitivity back.
430 // Set channel back 430 // Set channel back
431 CARDbSetChannel(pMgmt->pAdapter, pMgmt->uCurrChannel); 431 CARDbSetChannel(pMgmt->pAdapter, pMgmt->uCurrChannel);
432 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel); 432 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel);
433 if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { 433 if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
434 CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC); 434 CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC);
435 } else { 435 } else {
@@ -441,7 +441,7 @@ vCommandTimer (
441 } else { 441 } else {
442//2008-8-4 <add> by chester 442//2008-8-4 <add> by chester
443 if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) { 443 if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) {
444 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d \n",pMgmt->uScanChannel); 444 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d \n",pMgmt->uScanChannel);
445 s_bCommandComplete(pDevice); 445 s_bCommandComplete(pDevice);
446 return; 446 return;
447 } 447 }
@@ -464,9 +464,9 @@ vCommandTimer (
464 vAdHocBeaconStop(pDevice); 464 vAdHocBeaconStop(pDevice);
465 465
466 if (CARDbSetChannel(pMgmt->pAdapter, pMgmt->uScanChannel) == TRUE) { 466 if (CARDbSetChannel(pMgmt->pAdapter, pMgmt->uScanChannel) == TRUE) {
467 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SCAN Channel: %d\n", pMgmt->uScanChannel); 467 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SCAN Channel: %d\n", pMgmt->uScanChannel);
468 } else { 468 } else {
469 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SET SCAN Channel Fail: %d\n", pMgmt->uScanChannel); 469 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SET SCAN Channel Fail: %d\n", pMgmt->uScanChannel);
470 } 470 }
471 CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_UNKNOWN); 471 CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_UNKNOWN);
472// printk("chester-mxch=%d\n",pDevice->byMaxChannel); 472// printk("chester-mxch=%d\n",pDevice->byMaxChannel);
@@ -502,7 +502,7 @@ vCommandTimer (
502 // Set Baseband's sensitivity back. 502 // Set Baseband's sensitivity back.
503 // Set channel back 503 // Set channel back
504 CARDbSetChannel(pMgmt->pAdapter, pMgmt->uCurrChannel); 504 CARDbSetChannel(pMgmt->pAdapter, pMgmt->uCurrChannel);
505 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel); 505 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel);
506 if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { 506 if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
507 CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC); 507 CARDbSetBSSID(pMgmt->pAdapter, pMgmt->abyCurrBSSID, OP_MODE_ADHOC);
508 } else { 508 } else {
@@ -531,7 +531,7 @@ vCommandTimer (
531 spin_unlock_irq(&pDevice->lock); 531 spin_unlock_irq(&pDevice->lock);
532 return; 532 return;
533 } else { 533 } else {
534 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n"); 534 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n");
535 // reason = 8 : disassoc because sta has left 535 // reason = 8 : disassoc because sta has left
536 vMgrDisassocBeginSta((HANDLE)pDevice, pMgmt, pMgmt->abyCurrBSSID, (8), &Status); 536 vMgrDisassocBeginSta((HANDLE)pDevice, pMgmt, pMgmt->abyCurrBSSID, (8), &Status);
537 pDevice->bLinkPass = FALSE; 537 pDevice->bLinkPass = FALSE;
@@ -551,7 +551,7 @@ vCommandTimer (
551 spin_unlock_irq(&pDevice->lock); 551 spin_unlock_irq(&pDevice->lock);
552 return; 552 return;
553 }; 553 };
554 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" CARDbRadioPowerOff\n"); 554 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" CARDbRadioPowerOff\n");
555 //2008-09-02 <mark> by chester 555 //2008-09-02 <mark> by chester
556 // CARDbRadioPowerOff(pDevice); 556 // CARDbRadioPowerOff(pDevice);
557 s_bCommandComplete(pDevice); 557 s_bCommandComplete(pDevice);
@@ -582,15 +582,15 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
582 //((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN); 582 //((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN);
583 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; 583 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
584 pItemSSIDCurr = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; 584 pItemSSIDCurr = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
585 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n", pItemSSID->abySSID); 585 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n", pItemSSID->abySSID);
586 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: curr ssid = %s\n", pItemSSIDCurr->abySSID); 586 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: curr ssid = %s\n", pItemSSIDCurr->abySSID);
587 587
588 if (pMgmt->eCurrState == WMAC_STATE_ASSOC) { 588 if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
589 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Cmd pMgmt->eCurrState == WMAC_STATE_ASSOC\n"); 589 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Cmd pMgmt->eCurrState == WMAC_STATE_ASSOC\n");
590 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSID->len =%d\n",pItemSSID->len); 590 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSID->len =%d\n",pItemSSID->len);
591 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSIDCurr->len = %d\n",pItemSSIDCurr->len); 591 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSIDCurr->len = %d\n",pItemSSIDCurr->len);
592 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" desire ssid = %s\n", pItemSSID->abySSID); 592 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" desire ssid = %s\n", pItemSSID->abySSID);
593 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" curr ssid = %s\n", pItemSSIDCurr->abySSID); 593 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" curr ssid = %s\n", pItemSSIDCurr->abySSID);
594 } 594 }
595 595
596 if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) || 596 if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
@@ -629,7 +629,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
629 pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT; 629 pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT;
630 vCommandTimerWait((HANDLE)pDevice, AUTHENTICATE_TIMEOUT); 630 vCommandTimerWait((HANDLE)pDevice, AUTHENTICATE_TIMEOUT);
631 spin_unlock_irq(&pDevice->lock); 631 spin_unlock_irq(&pDevice->lock);
632 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n"); 632 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n");
633 return; 633 return;
634 } 634 }
635 } 635 }
@@ -649,7 +649,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
649 // start own IBSS 649 // start own IBSS
650 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status); 650 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status);
651 if (Status != CMD_STATUS_SUCCESS){ 651 if (Status != CMD_STATUS_SUCCESS){
652 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " WLAN_CMD_IBSS_CREATE fail ! \n"); 652 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " WLAN_CMD_IBSS_CREATE fail ! \n");
653 }; 653 };
654 BSSvAddMulticastNode(pDevice); 654 BSSvAddMulticastNode(pDevice);
655 } 655 }
@@ -661,7 +661,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
661 // start own IBSS 661 // start own IBSS
662 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status); 662 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status);
663 if (Status != CMD_STATUS_SUCCESS){ 663 if (Status != CMD_STATUS_SUCCESS){
664 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_IBSS_CREATE fail ! \n"); 664 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_IBSS_CREATE fail ! \n");
665 }; 665 };
666 BSSvAddMulticastNode(pDevice); 666 BSSvAddMulticastNode(pDevice);
667 if (netif_queue_stopped(pDevice->dev)){ 667 if (netif_queue_stopped(pDevice->dev)){
@@ -670,7 +670,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
670 pDevice->bLinkPass = TRUE; 670 pDevice->bLinkPass = TRUE;
671 } 671 }
672 else { 672 else {
673 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disconnect SSID none\n"); 673 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disconnect SSID none\n");
674 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 674 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
675 // if(pDevice->bWPASuppWextEnabled == TRUE) 675 // if(pDevice->bWPASuppWextEnabled == TRUE)
676 { 676 {
@@ -688,15 +688,15 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
688 break; 688 break;
689 689
690 case WLAN_AUTHENTICATE_WAIT : 690 case WLAN_AUTHENTICATE_WAIT :
691 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_AUTHENTICATE_WAIT\n"); 691 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_AUTHENTICATE_WAIT\n");
692 if (pMgmt->eCurrState == WMAC_STATE_AUTH) { 692 if (pMgmt->eCurrState == WMAC_STATE_AUTH) {
693 // Call mgr to begin the association 693 // Call mgr to begin the association
694 pDevice->byLinkWaitCount = 0; 694 pDevice->byLinkWaitCount = 0;
695 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_AUTH\n"); 695 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_AUTH\n");
696 vMgrAssocBeginSta((HANDLE)pDevice, pMgmt, &Status); 696 vMgrAssocBeginSta((HANDLE)pDevice, pMgmt, &Status);
697 if (Status == CMD_STATUS_SUCCESS) { 697 if (Status == CMD_STATUS_SUCCESS) {
698 pDevice->byLinkWaitCount = 0; 698 pDevice->byLinkWaitCount = 0;
699 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState = WLAN_ASSOCIATE_WAIT\n"); 699 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState = WLAN_ASSOCIATE_WAIT\n");
700 pDevice->eCommandState = WLAN_ASSOCIATE_WAIT; 700 pDevice->eCommandState = WLAN_ASSOCIATE_WAIT;
701 vCommandTimerWait((HANDLE)pDevice, ASSOCIATE_TIMEOUT); 701 vCommandTimerWait((HANDLE)pDevice, ASSOCIATE_TIMEOUT);
702 spin_unlock_irq(&pDevice->lock); 702 spin_unlock_irq(&pDevice->lock);
@@ -732,7 +732,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
732 732
733 case WLAN_ASSOCIATE_WAIT : 733 case WLAN_ASSOCIATE_WAIT :
734 if (pMgmt->eCurrState == WMAC_STATE_ASSOC) { 734 if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
735 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_ASSOC\n"); 735 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_ASSOC\n");
736 if (pDevice->ePSMode != WMAC_POWER_CAM) { 736 if (pDevice->ePSMode != WMAC_POWER_CAM) {
737 PSvEnablePowerSaving((HANDLE)pDevice, pMgmt->wListenInterval); 737 PSvEnablePowerSaving((HANDLE)pDevice, pMgmt->wListenInterval);
738 } 738 }
@@ -796,7 +796,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
796 break; 796 break;
797 797
798 case WLAN_CMD_AP_MODE_START : 798 case WLAN_CMD_AP_MODE_START :
799 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_AP_MODE_START\n"); 799 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_AP_MODE_START\n");
800 800
801 if (pMgmt->eConfigMode == WMAC_CONFIG_AP) { 801 if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
802 del_timer(&pMgmt->sTimerSecondCallback); 802 del_timer(&pMgmt->sTimerSecondCallback);
@@ -813,12 +813,12 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
813 813
814 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status); 814 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status);
815 if (Status != CMD_STATUS_SUCCESS){ 815 if (Status != CMD_STATUS_SUCCESS){
816 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " vMgrCreateOwnIBSS fail ! \n"); 816 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " vMgrCreateOwnIBSS fail ! \n");
817 }; 817 };
818 // alway turn off unicast bit 818 // alway turn off unicast bit
819 MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_UNICAST); 819 MACvRegBitsOff(pDevice->PortOffset, MAC_REG_RCR, RCR_UNICAST);
820 pDevice->byRxMode &= ~RCR_UNICAST; 820 pDevice->byRxMode &= ~RCR_UNICAST;
821 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode ); 821 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode );
822 BSSvAddMulticastNode(pDevice); 822 BSSvAddMulticastNode(pDevice);
823 if (netif_queue_stopped(pDevice->dev)){ 823 if (netif_queue_stopped(pDevice->dev)){
824 netif_wake_queue(pDevice->dev); 824 netif_wake_queue(pDevice->dev);
@@ -841,7 +841,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
841 pDevice->bMoreData = TRUE; 841 pDevice->bMoreData = TRUE;
842 } 842 }
843 if (!device_dma0_xmit(pDevice, skb, 0)) { 843 if (!device_dma0_xmit(pDevice, skb, 0)) {
844 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail \n"); 844 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail \n");
845 } 845 }
846 pMgmt->sNodeDBTable[0].wEnQueueCnt--; 846 pMgmt->sNodeDBTable[0].wEnQueueCnt--;
847 } 847 }
@@ -851,7 +851,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
851 for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) { 851 for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
852 if (pMgmt->sNodeDBTable[ii].bActive && 852 if (pMgmt->sNodeDBTable[ii].bActive &&
853 pMgmt->sNodeDBTable[ii].bRxPSPoll) { 853 pMgmt->sNodeDBTable[ii].bRxPSPoll) {
854 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d Enqueu Cnt= %d\n", 854 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d Enqueu Cnt= %d\n",
855 ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt); 855 ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt);
856 while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL) { 856 while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL) {
857 if (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) { 857 if (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
@@ -864,7 +864,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
864 pDevice->bMoreData = TRUE; 864 pDevice->bMoreData = TRUE;
865 } 865 }
866 if (!device_dma0_xmit(pDevice, skb, ii)) { 866 if (!device_dma0_xmit(pDevice, skb, ii)) {
867 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail \n"); 867 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail \n");
868 } 868 }
869 pMgmt->sNodeDBTable[ii].wEnQueueCnt--; 869 pMgmt->sNodeDBTable[ii].wEnQueueCnt--;
870 // check if sta ps enable, wait next pspoll 870 // check if sta ps enable, wait next pspoll
@@ -876,7 +876,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
876 // clear tx map 876 // clear tx map
877 pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &= 877 pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
878 ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7]; 878 ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
879 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d PS queue clear \n", ii); 879 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d PS queue clear \n", ii);
880 } 880 }
881 pMgmt->sNodeDBTable[ii].bRxPSPoll = FALSE; 881 pMgmt->sNodeDBTable[ii].bRxPSPoll = FALSE;
882 } 882 }
@@ -887,7 +887,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
887 887
888 888
889 case WLAN_CMD_RADIO_START : 889 case WLAN_CMD_RADIO_START :
890 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_RADIO_START\n"); 890 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_RADIO_START\n");
891 if (pDevice->bRadioCmd == TRUE) 891 if (pDevice->bRadioCmd == TRUE)
892 CARDbRadioPowerOn(pDevice); 892 CARDbRadioPowerOn(pDevice);
893 else 893 else
@@ -898,7 +898,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
898 898
899 899
900 case WLAN_CMD_CHECK_BBSENSITIVITY_CHANGE : 900 case WLAN_CMD_CHECK_BBSENSITIVITY_CHANGE :
901 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_CHECK_BBSENSITIVITY_START\n"); 901 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_CHECK_BBSENSITIVITY_START\n");
902 // wait all TD complete 902 // wait all TD complete
903 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){ 903 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){
904 vCommandTimerWait((HANDLE)pDevice, 10); 904 vCommandTimerWait((HANDLE)pDevice, 10);
@@ -912,7 +912,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
912 } 912 }
913 pDevice->byBBVGACurrent = pDevice->byBBVGANew; 913 pDevice->byBBVGACurrent = pDevice->byBBVGANew;
914 BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent); 914 BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);
915 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SetVGAGainOffset %02X\n", pDevice->byBBVGACurrent); 915 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"SetVGAGainOffset %02X\n", pDevice->byBBVGACurrent);
916 s_bCommandComplete(pDevice); 916 s_bCommandComplete(pDevice);
917 break; 917 break;
918 918
@@ -956,7 +956,7 @@ s_bCommandComplete (
956 pDevice->bCmdRunning = TRUE; 956 pDevice->bCmdRunning = TRUE;
957 switch ( pDevice->eCommand ) { 957 switch ( pDevice->eCommand ) {
958 case WLAN_CMD_BSSID_SCAN: 958 case WLAN_CMD_BSSID_SCAN:
959 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_BSSID_SCAN\n"); 959 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_BSSID_SCAN\n");
960 pDevice->eCommandState = WLAN_CMD_SCAN_START; 960 pDevice->eCommandState = WLAN_CMD_SCAN_START;
961 pMgmt->uScanChannel = 0; 961 pMgmt->uScanChannel = 0;
962 if (pSSID->len != 0) { 962 if (pSSID->len != 0) {
@@ -979,7 +979,7 @@ s_bCommandComplete (
979 pSSID->len = WLAN_SSID_MAXLEN; 979 pSSID->len = WLAN_SSID_MAXLEN;
980 if (pSSID->len != 0) 980 if (pSSID->len != 0)
981 MEMvCopy(pDevice->pMgmt->abyDesireSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); 981 MEMvCopy(pDevice->pMgmt->abyDesireSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
982 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_SSID_START\n"); 982 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_SSID_START\n");
983 break; 983 break;
984 case WLAN_CMD_DISASSOCIATE: 984 case WLAN_CMD_DISASSOCIATE:
985 pDevice->eCommandState = WLAN_CMD_DISASSOCIATE_START; 985 pDevice->eCommandState = WLAN_CMD_DISASSOCIATE_START;
diff --git a/drivers/staging/vt6655/wctl.c b/drivers/staging/vt6655/wctl.c
index ac9ec7e0806..2b41c199983 100644
--- a/drivers/staging/vt6655/wctl.c
+++ b/drivers/staging/vt6655/wctl.c
@@ -217,7 +217,7 @@ UINT uHeaderSize;
217 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength = cbFrameLength; 217 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength = cbFrameLength;
218 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += cbFrameLength; 218 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += cbFrameLength;
219 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum++; 219 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum++;
220 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "First pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx); 220 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "First pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx);
221 return(FALSE); 221 return(FALSE);
222 } 222 }
223 else { 223 else {
@@ -231,7 +231,7 @@ UINT uHeaderSize;
231 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength += (cbFrameLength - uHeaderSize); 231 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].cbFrameLength += (cbFrameLength - uHeaderSize);
232 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += (cbFrameLength - uHeaderSize); 232 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].pbyRxBuffer += (cbFrameLength - uHeaderSize);
233 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum++; 233 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].wFragNum++;
234 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Second pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx); 234 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Second pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx);
235 } 235 }
236 else { 236 else {
237 // seq error or frag # error flush DFCB 237 // seq error or frag # error flush DFCB
@@ -247,7 +247,7 @@ UINT uHeaderSize;
247 //enq defragcontrolblock 247 //enq defragcontrolblock
248 pDevice->cbFreeDFCB++; 248 pDevice->cbFreeDFCB++;
249 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].bInUse = FALSE; 249 pDevice->sRxDFCB[pDevice->uCurrentDFCBIdx].bInUse = FALSE;
250 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Last pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx); 250 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Last pDevice->uCurrentDFCBIdx= %d\n", pDevice->uCurrentDFCBIdx);
251 return(TRUE); 251 return(TRUE);
252 } 252 }
253 return(FALSE); 253 return(FALSE);
diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c
index 6b3bf074620..c6a6a0a3556 100644
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@@ -656,10 +656,10 @@ vMgrReAssocBeginSta(
656 /* send the frame */ 656 /* send the frame */
657 *pStatus = csMgmt_xmit(pDevice, pTxPacket); 657 *pStatus = csMgmt_xmit(pDevice, pTxPacket);
658 if (*pStatus != CMD_STATUS_PENDING) { 658 if (*pStatus != CMD_STATUS_PENDING) {
659 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Reassociation tx failed.\n"); 659 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Reassociation tx failed.\n");
660 } 660 }
661 else { 661 else {
662 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Reassociation tx sending.\n"); 662 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Reassociation tx sending.\n");
663 } 663 }
664 } 664 }
665 665
@@ -836,8 +836,8 @@ s_vMgrRxAssocRequest(
836 pDevice->bBarkerPreambleMd = TRUE; 836 pDevice->bBarkerPreambleMd = TRUE;
837 } 837 }
838 838
839 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Associate AID= %d \n", wAssocAID); 839 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Associate AID= %d \n", wAssocAID);
840 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X \n", 840 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X \n",
841 sFrame.pHdr->sA3.abyAddr2[0], 841 sFrame.pHdr->sA3.abyAddr2[0],
842 sFrame.pHdr->sA3.abyAddr2[1], 842 sFrame.pHdr->sA3.abyAddr2[1],
843 sFrame.pHdr->sA3.abyAddr2[2], 843 sFrame.pHdr->sA3.abyAddr2[2],
@@ -845,7 +845,7 @@ s_vMgrRxAssocRequest(
845 sFrame.pHdr->sA3.abyAddr2[4], 845 sFrame.pHdr->sA3.abyAddr2[4],
846 sFrame.pHdr->sA3.abyAddr2[5] 846 sFrame.pHdr->sA3.abyAddr2[5]
847 ) ; 847 ) ;
848 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Max Support rate = %d \n", 848 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Max Support rate = %d \n",
849 pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate); 849 pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate);
850 }//else { TODO: received STA under state1 handle } 850 }//else { TODO: received STA under state1 handle }
851 else { 851 else {
@@ -873,10 +873,10 @@ s_vMgrRxAssocRequest(
873 /* send the frame */ 873 /* send the frame */
874 Status = csMgmt_xmit(pDevice, pTxPacket); 874 Status = csMgmt_xmit(pDevice, pTxPacket);
875 if (Status != CMD_STATUS_PENDING) { 875 if (Status != CMD_STATUS_PENDING) {
876 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Assoc response tx failed\n"); 876 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Assoc response tx failed\n");
877 } 877 }
878 else { 878 else {
879 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Assoc response tx sending..\n"); 879 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Assoc response tx sending..\n");
880 } 880 }
881 881
882 } 882 }
@@ -996,8 +996,8 @@ s_vMgrRxReAssocRequest(
996 pDevice->bBarkerPreambleMd = TRUE; 996 pDevice->bBarkerPreambleMd = TRUE;
997 } 997 }
998 998
999 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Rx ReAssociate AID= %d \n", wAssocAID); 999 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Rx ReAssociate AID= %d \n", wAssocAID);
1000 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X \n", 1000 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "MAC=%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X \n",
1001 sFrame.pHdr->sA3.abyAddr2[0], 1001 sFrame.pHdr->sA3.abyAddr2[0],
1002 sFrame.pHdr->sA3.abyAddr2[1], 1002 sFrame.pHdr->sA3.abyAddr2[1],
1003 sFrame.pHdr->sA3.abyAddr2[2], 1003 sFrame.pHdr->sA3.abyAddr2[2],
@@ -1005,7 +1005,7 @@ s_vMgrRxReAssocRequest(
1005 sFrame.pHdr->sA3.abyAddr2[4], 1005 sFrame.pHdr->sA3.abyAddr2[4],
1006 sFrame.pHdr->sA3.abyAddr2[5] 1006 sFrame.pHdr->sA3.abyAddr2[5]
1007 ) ; 1007 ) ;
1008 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Max Support rate = %d \n", 1008 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Max Support rate = %d \n",
1009 pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate); 1009 pMgmt->sNodeDBTable[uNodeIndex].wMaxSuppRate);
1010 1010
1011 } 1011 }
@@ -1031,10 +1031,10 @@ s_vMgrRxReAssocRequest(
1031 } 1031 }
1032 Status = csMgmt_xmit(pDevice, pTxPacket); 1032 Status = csMgmt_xmit(pDevice, pTxPacket);
1033 if (Status != CMD_STATUS_PENDING) { 1033 if (Status != CMD_STATUS_PENDING) {
1034 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:ReAssoc response tx failed\n"); 1034 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:ReAssoc response tx failed\n");
1035 } 1035 }
1036 else { 1036 else {
1037 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:ReAssoc response tx sending..\n"); 1037 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:ReAssoc response tx sending..\n");
1038 } 1038 }
1039 } 1039 }
1040 return; 1040 return;
@@ -1099,13 +1099,13 @@ s_vMgrRxAssocResponse(
1099 pMgmt->wCurrAID = cpu_to_le16((*(sFrame.pwAid))); 1099 pMgmt->wCurrAID = cpu_to_le16((*(sFrame.pwAid)));
1100 if ( (pMgmt->wCurrAID >> 14) != (BIT0 | BIT1) ) 1100 if ( (pMgmt->wCurrAID >> 14) != (BIT0 | BIT1) )
1101 { 1101 {
1102 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "AID from AP, has two msb clear.\n"); 1102 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "AID from AP, has two msb clear.\n");
1103 }; 1103 };
1104 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Association Successful, AID=%d.\n", pMgmt->wCurrAID & ~(BIT14|BIT15)); 1104 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Association Successful, AID=%d.\n", pMgmt->wCurrAID & ~(BIT14|BIT15));
1105 pMgmt->eCurrState = WMAC_STATE_ASSOC; 1105 pMgmt->eCurrState = WMAC_STATE_ASSOC;
1106 BSSvUpdateAPNode((HANDLE)pDevice, sFrame.pwCapInfo, sFrame.pSuppRates, sFrame.pExtSuppRates); 1106 BSSvUpdateAPNode((HANDLE)pDevice, sFrame.pwCapInfo, sFrame.pSuppRates, sFrame.pExtSuppRates);
1107 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; 1107 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
1108 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "Link with AP(SSID): %s\n", pItemSSID->abySSID); 1108 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Link with AP(SSID): %s\n", pItemSSID->abySSID);
1109 pDevice->bLinkPass = TRUE; 1109 pDevice->bLinkPass = TRUE;
1110 pDevice->uBBVGADiffCount = 0; 1110 pDevice->uBBVGADiffCount = 0;
1111 if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) { 1111 if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
@@ -1362,7 +1362,7 @@ s_vMgrRxAuthentication(
1362 s_vMgrRxAuthenSequence_4(pDevice, pMgmt, &sFrame); 1362 s_vMgrRxAuthenSequence_4(pDevice, pMgmt, &sFrame);
1363 break; 1363 break;
1364 default: 1364 default:
1365 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Auth Sequence error, seq = %d\n", 1365 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Auth Sequence error, seq = %d\n",
1366 cpu_to_le16((*(sFrame.pwAuthSequence)))); 1366 cpu_to_le16((*(sFrame.pwAuthSequence))));
1367 break; 1367 break;
1368 } 1368 }
@@ -1469,9 +1469,9 @@ s_vMgrRxAuthenSequence_1(
1469 if (pDevice->bEnableHostapd) { 1469 if (pDevice->bEnableHostapd) {
1470 return; 1470 return;
1471 } 1471 }
1472 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx.. \n"); 1472 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx.. \n");
1473 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { 1473 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
1474 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx failed.\n"); 1474 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_1 tx failed.\n");
1475 } 1475 }
1476 return; 1476 return;
1477} 1477}
@@ -1506,12 +1506,12 @@ s_vMgrRxAuthenSequence_2(
1506 { 1506 {
1507 case WLAN_AUTH_ALG_OPENSYSTEM: 1507 case WLAN_AUTH_ALG_OPENSYSTEM:
1508 if ( cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS ){ 1508 if ( cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS ){
1509 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (OPEN) Successful.\n"); 1509 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (OPEN) Successful.\n");
1510 pMgmt->eCurrState = WMAC_STATE_AUTH; 1510 pMgmt->eCurrState = WMAC_STATE_AUTH;
1511 timer_expire(pDevice->sTimerCommand, 0); 1511 timer_expire(pDevice->sTimerCommand, 0);
1512 } 1512 }
1513 else { 1513 else {
1514 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (OPEN) Failed.\n"); 1514 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (OPEN) Failed.\n");
1515 s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus)))); 1515 s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus))));
1516 pMgmt->eCurrState = WMAC_STATE_IDLE; 1516 pMgmt->eCurrState = WMAC_STATE_IDLE;
1517 } 1517 }
@@ -1556,12 +1556,12 @@ s_vMgrRxAuthenSequence_2(
1556 pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN; 1556 pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
1557 // send the frame 1557 // send the frame
1558 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { 1558 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
1559 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Auth_reply sequence_2 tx failed.\n"); 1559 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Auth_reply sequence_2 tx failed.\n");
1560 } 1560 }
1561 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Auth_reply sequence_2 tx ...\n"); 1561 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Auth_reply sequence_2 tx ...\n");
1562 } 1562 }
1563 else { 1563 else {
1564 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:rx Auth_reply sequence_2 status error ...\n"); 1564 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:rx Auth_reply sequence_2 status error ...\n");
1565 if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) { 1565 if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) {
1566// spin_unlock_irq(&pDevice->lock); 1566// spin_unlock_irq(&pDevice->lock);
1567// vCommandTimerWait((HANDLE)pDevice, 0); 1567// vCommandTimerWait((HANDLE)pDevice, 0);
@@ -1571,7 +1571,7 @@ s_vMgrRxAuthenSequence_2(
1571 } 1571 }
1572 break; 1572 break;
1573 default: 1573 default:
1574 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt: rx auth.seq = 2 unknown AuthAlgorithm=%d\n", cpu_to_le16((*(pFrame->pwAuthAlgorithm)))); 1574 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt: rx auth.seq = 2 unknown AuthAlgorithm=%d\n", cpu_to_le16((*(pFrame->pwAuthAlgorithm))));
1575 break; 1575 break;
1576 } 1576 }
1577 return; 1577 return;
@@ -1629,7 +1629,7 @@ s_vMgrRxAuthenSequence_3(
1629 pMgmt->sNodeDBTable[uNodeIndex].byAuthSequence = 0; 1629 pMgmt->sNodeDBTable[uNodeIndex].byAuthSequence = 0;
1630 } 1630 }
1631 uStatusCode = WLAN_MGMT_STATUS_SUCCESS; 1631 uStatusCode = WLAN_MGMT_STATUS_SUCCESS;
1632 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Challenge text check ok..\n"); 1632 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Challenge text check ok..\n");
1633 1633
1634reply: 1634reply:
1635 // send auth reply 1635 // send auth reply
@@ -1662,7 +1662,7 @@ reply:
1662 return; 1662 return;
1663 } 1663 }
1664 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) { 1664 if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
1665 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_4 tx failed.\n"); 1665 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Authreq_reply sequence_4 tx failed.\n");
1666 } 1666 }
1667 return; 1667 return;
1668 1668
@@ -1690,12 +1690,12 @@ s_vMgrRxAuthenSequence_4(
1690{ 1690{
1691 1691
1692 if ( cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS ){ 1692 if ( cpu_to_le16((*(pFrame->pwStatus))) == WLAN_MGMT_STATUS_SUCCESS ){
1693 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (SHAREDKEY) Successful.\n"); 1693 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (SHAREDKEY) Successful.\n");
1694 pMgmt->eCurrState = WMAC_STATE_AUTH; 1694 pMgmt->eCurrState = WMAC_STATE_AUTH;
1695 timer_expire(pDevice->sTimerCommand, 0); 1695 timer_expire(pDevice->sTimerCommand, 0);
1696 } 1696 }
1697 else{ 1697 else{
1698 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (SHAREDKEY) Failed.\n"); 1698 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "802.11 Authen (SHAREDKEY) Failed.\n");
1699 s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus))) ); 1699 s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus))) );
1700 pMgmt->eCurrState = WMAC_STATE_IDLE; 1700 pMgmt->eCurrState = WMAC_STATE_IDLE;
1701 } 1701 }
@@ -1741,14 +1741,14 @@ s_vMgrRxDisassociation(
1741 BSSvRemoveOneNode(pDevice, uNodeIndex); 1741 BSSvRemoveOneNode(pDevice, uNodeIndex);
1742 } 1742 }
1743 else { 1743 else {
1744 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx disassoc, sta not found\n"); 1744 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx disassoc, sta not found\n");
1745 } 1745 }
1746 } 1746 }
1747 else if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA ){ 1747 else if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA ){
1748 sFrame.len = pRxPacket->cbMPDULen; 1748 sFrame.len = pRxPacket->cbMPDULen;
1749 sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1749 sFrame.pBuf = (PBYTE)pRxPacket->p80211Header;
1750 vMgrDecodeDisassociation(&sFrame); 1750 vMgrDecodeDisassociation(&sFrame);
1751 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP disassociated me, reason=%d.\n", cpu_to_le16(*(sFrame.pwReason))); 1751 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP disassociated me, reason=%d.\n", cpu_to_le16(*(sFrame.pwReason)));
1752 //TODO: do something let upper layer know or 1752 //TODO: do something let upper layer know or
1753 //try to send associate packet again because of inactivity timeout 1753 //try to send associate packet again because of inactivity timeout
1754 // if (pMgmt->eCurrState == WMAC_STATE_ASSOC) { 1754 // if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
@@ -1822,7 +1822,7 @@ s_vMgrRxDeauthentication(
1822 BSSvRemoveOneNode(pDevice, uNodeIndex); 1822 BSSvRemoveOneNode(pDevice, uNodeIndex);
1823 } 1823 }
1824 else { 1824 else {
1825 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Rx deauth, sta not found\n"); 1825 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Rx deauth, sta not found\n");
1826 } 1826 }
1827 } 1827 }
1828 else { 1828 else {
@@ -1830,7 +1830,7 @@ s_vMgrRxDeauthentication(
1830 sFrame.len = pRxPacket->cbMPDULen; 1830 sFrame.len = pRxPacket->cbMPDULen;
1831 sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 1831 sFrame.pBuf = (PBYTE)pRxPacket->p80211Header;
1832 vMgrDecodeDeauthen(&sFrame); 1832 vMgrDecodeDeauthen(&sFrame);
1833 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP deauthed me, reason=%d.\n", cpu_to_le16((*(sFrame.pwReason)))); 1833 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP deauthed me, reason=%d.\n", cpu_to_le16((*(sFrame.pwReason))));
1834 // TODO: update BSS list for specific BSSID if pre-authentication case 1834 // TODO: update BSS list for specific BSSID if pre-authentication case
1835 if (IS_ETH_ADDRESS_EQUAL(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID)) { 1835 if (IS_ETH_ADDRESS_EQUAL(sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID)) {
1836 if (pMgmt->eCurrState >= WMAC_STATE_AUTHPENDING) { 1836 if (pMgmt->eCurrState >= WMAC_STATE_AUTHPENDING) {
@@ -1972,7 +1972,7 @@ s_vMgrRxBeacon(
1972 (sFrame.pwCapInfo == 0) || 1972 (sFrame.pwCapInfo == 0) ||
1973 (sFrame.pSSID == 0) || 1973 (sFrame.pSSID == 0) ||
1974 (sFrame.pSuppRates == 0) ) { 1974 (sFrame.pSuppRates == 0) ) {
1975 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx beacon frame error\n"); 1975 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx beacon frame error\n");
1976 return; 1976 return;
1977 }; 1977 };
1978 1978
@@ -2008,7 +2008,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2008 2008
2009 pBSSList = BSSpAddrIsInBSSList((HANDLE)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID); 2009 pBSSList = BSSpAddrIsInBSSList((HANDLE)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID);
2010 if (pBSSList == NULL) { 2010 if (pBSSList == NULL) {
2011 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon/insert: RxChannel = : %d\n", byCurrChannel); 2011 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon/insert: RxChannel = : %d\n", byCurrChannel);
2012 BSSbInsertToBSSList((HANDLE)pDevice, 2012 BSSbInsertToBSSList((HANDLE)pDevice,
2013 sFrame.pHdr->sA3.abyAddr3, 2013 sFrame.pHdr->sA3.abyAddr3,
2014 *sFrame.pqwTimestamp, 2014 *sFrame.pqwTimestamp,
@@ -2029,7 +2029,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2029 ); 2029 );
2030 } 2030 }
2031 else { 2031 else {
2032// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"update bcn: RxChannel = : %d\n", byCurrChannel); 2032// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"update bcn: RxChannel = : %d\n", byCurrChannel);
2033 BSSbUpdateToBSSList((HANDLE)pDevice, 2033 BSSbUpdateToBSSList((HANDLE)pDevice,
2034 *sFrame.pqwTimestamp, 2034 *sFrame.pqwTimestamp,
2035 *sFrame.pwBeaconInterval, 2035 *sFrame.pwBeaconInterval,
@@ -2106,7 +2106,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2106 2106
2107 if (pMgmt->sNodeDBTable[0].uInActiveCount != 0) { 2107 if (pMgmt->sNodeDBTable[0].uInActiveCount != 0) {
2108 pMgmt->sNodeDBTable[0].uInActiveCount = 0; 2108 pMgmt->sNodeDBTable[0].uInActiveCount = 0;
2109 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BCN:Wake Count= [%d]\n", pMgmt->wCountToWakeUp); 2109 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BCN:Wake Count= [%d]\n", pMgmt->wCountToWakeUp);
2110 } 2110 }
2111 } 2111 }
2112 // check if SSID the same 2112 // check if SSID the same
@@ -2195,7 +2195,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2195 } 2195 }
2196 } 2196 }
2197 2197
2198// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon 2 \n"); 2198// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon 2 \n");
2199 // check if CF field exisit 2199 // check if CF field exisit
2200 if (WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo)) { 2200 if (WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo)) {
2201 if (sFrame.pCFParms->wCFPDurRemaining > 0) { 2201 if (sFrame.pCFParms->wCFPDurRemaining > 0) {
@@ -2276,23 +2276,23 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2276 (pMgmt->bMulticastTIM && (pMgmt->byDTIMCount == 0))) { 2276 (pMgmt->bMulticastTIM && (pMgmt->byDTIMCount == 0))) {
2277 pMgmt->bInTIMWake = TRUE; 2277 pMgmt->bInTIMWake = TRUE;
2278 // send out ps-poll packet 2278 // send out ps-poll packet
2279// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN:In TIM\n"); 2279// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN:In TIM\n");
2280 if (pMgmt->bInTIM) { 2280 if (pMgmt->bInTIM) {
2281 PSvSendPSPOLL((PSDevice)pDevice); 2281 PSvSendPSPOLL((PSDevice)pDevice);
2282// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN:PS-POLL sent..\n"); 2282// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN:PS-POLL sent..\n");
2283 }; 2283 };
2284 2284
2285 } 2285 }
2286 else { 2286 else {
2287 pMgmt->bInTIMWake = FALSE; 2287 pMgmt->bInTIMWake = FALSE;
2288 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Not In TIM..\n"); 2288 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Not In TIM..\n");
2289 if (pDevice->bPWBitOn == FALSE) { 2289 if (pDevice->bPWBitOn == FALSE) {
2290 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Send Null Packet\n"); 2290 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Send Null Packet\n");
2291 if (PSbSendNullPacket(pDevice)) 2291 if (PSbSendNullPacket(pDevice))
2292 pDevice->bPWBitOn = TRUE; 2292 pDevice->bPWBitOn = TRUE;
2293 } 2293 }
2294 if(PSbConsiderPowerDown(pDevice, FALSE, FALSE)) { 2294 if(PSbConsiderPowerDown(pDevice, FALSE, FALSE)) {
2295 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Power down now...\n"); 2295 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Power down now...\n");
2296 }; 2296 };
2297 } 2297 }
2298 2298
@@ -2369,7 +2369,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2369 2369
2370 // if other stations jointed, indicate connect to upper layer.. 2370 // if other stations jointed, indicate connect to upper layer..
2371 if (pMgmt->eCurrState == WMAC_STATE_STARTED) { 2371 if (pMgmt->eCurrState == WMAC_STATE_STARTED) {
2372 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Current IBSS State: [Started]........to: [Jointed] \n"); 2372 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Current IBSS State: [Started]........to: [Jointed] \n");
2373 pMgmt->eCurrState = WMAC_STATE_JOINTED; 2373 pMgmt->eCurrState = WMAC_STATE_JOINTED;
2374 pDevice->bLinkPass = TRUE; 2374 pDevice->bLinkPass = TRUE;
2375 if (netif_queue_stopped(pDevice->dev)){ 2375 if (netif_queue_stopped(pDevice->dev)){
@@ -2397,7 +2397,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2397 (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, 2397 (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
2398 WLAN_RATES_MAXLEN_11B); 2398 WLAN_RATES_MAXLEN_11B);
2399 // set HW beacon interval and re-synchronizing.... 2399 // set HW beacon interval and re-synchronizing....
2400 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rejoining to Other Adhoc group with same SSID........\n"); 2400 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rejoining to Other Adhoc group with same SSID........\n");
2401 VNSvOutPortW(pDevice->PortOffset + MAC_REG_BI, pMgmt->wCurrBeaconPeriod); 2401 VNSvOutPortW(pDevice->PortOffset + MAC_REG_BI, pMgmt->wCurrBeaconPeriod);
2402 CARDbUpdateTSF(pDevice, pRxPacket->byRxRate, qwTimestamp, qwLocalTSF); 2402 CARDbUpdateTSF(pDevice, pRxPacket->byRxRate, qwTimestamp, qwLocalTSF);
2403 CARDvUpdateNextTBTT(pDevice->PortOffset, qwTimestamp, pMgmt->wCurrBeaconPeriod); 2403 CARDvUpdateNextTBTT(pDevice->PortOffset, qwTimestamp, pMgmt->wCurrBeaconPeriod);
@@ -2466,7 +2466,7 @@ vMgrCreateOwnIBSS(
2466 BYTE abyOFDM_RATE[] = {0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; 2466 BYTE abyOFDM_RATE[] = {0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
2467 WORD wSuppRate; 2467 WORD wSuppRate;
2468 2468
2469 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create Basic Service Set .......\n"); 2469 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create Basic Service Set .......\n");
2470 2470
2471 if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA) { 2471 if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA) {
2472 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) && 2472 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPANONE) &&
@@ -2583,7 +2583,7 @@ vMgrCreateOwnIBSS(
2583 if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { 2583 if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
2584 // AP mode BSSID = MAC addr 2584 // AP mode BSSID = MAC addr
2585 memcpy(pMgmt->abyCurrBSSID, pMgmt->abyMACAddr, WLAN_ADDR_LEN); 2585 memcpy(pMgmt->abyCurrBSSID, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
2586 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO"AP beacon created BSSID:%02x-%02x-%02x-%02x-%02x-%02x \n", 2586 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"AP beacon created BSSID:%02x-%02x-%02x-%02x-%02x-%02x \n",
2587 pMgmt->abyCurrBSSID[0], 2587 pMgmt->abyCurrBSSID[0],
2588 pMgmt->abyCurrBSSID[1], 2588 pMgmt->abyCurrBSSID[1],
2589 pMgmt->abyCurrBSSID[2], 2589 pMgmt->abyCurrBSSID[2],
@@ -2612,7 +2612,7 @@ vMgrCreateOwnIBSS(
2612 pMgmt->abyCurrBSSID[0] |= IEEE_ADDR_UNIVERSAL; 2612 pMgmt->abyCurrBSSID[0] |= IEEE_ADDR_UNIVERSAL;
2613 2613
2614 2614
2615 DEVICE_PRT(MSG_LEVEL_INFO, KERN_INFO"Adhoc beacon created bssid:%02x-%02x-%02x-%02x-%02x-%02x \n", 2615 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"Adhoc beacon created bssid:%02x-%02x-%02x-%02x-%02x-%02x \n",
2616 pMgmt->abyCurrBSSID[0], 2616 pMgmt->abyCurrBSSID[0],
2617 pMgmt->abyCurrBSSID[1], 2617 pMgmt->abyCurrBSSID[1],
2618 pMgmt->abyCurrBSSID[2], 2618 pMgmt->abyCurrBSSID[2],
@@ -2743,7 +2743,7 @@ vMgrJoinBSSBegin(
2743 2743
2744 if (ii == MAX_BSS_NUM) { 2744 if (ii == MAX_BSS_NUM) {
2745 *pStatus = CMD_STATUS_RESOURCES; 2745 *pStatus = CMD_STATUS_RESOURCES;
2746 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "BSS finding:BSS list is empty.\n"); 2746 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "BSS finding:BSS list is empty.\n");
2747 return; 2747 return;
2748 }; 2748 };
2749 2749
@@ -2759,11 +2759,11 @@ vMgrJoinBSSBegin(
2759 if (pCurr == NULL){ 2759 if (pCurr == NULL){
2760 *pStatus = CMD_STATUS_RESOURCES; 2760 *pStatus = CMD_STATUS_RESOURCES;
2761 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; 2761 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
2762 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Scanning [%s] not found, disconnected !\n", pItemSSID->abySSID); 2762 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Scanning [%s] not found, disconnected !\n", pItemSSID->abySSID);
2763 return; 2763 return;
2764 }; 2764 };
2765 2765
2766 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP(BSS) finding:Found a AP(BSS)..\n"); 2766 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP(BSS) finding:Found a AP(BSS)..\n");
2767 if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))){ 2767 if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))){
2768 2768
2769 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA)||(pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) { 2769 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA)||(pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
@@ -2772,14 +2772,14 @@ vMgrJoinBSSBegin(
2772/* 2772/*
2773 if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) { 2773 if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) {
2774 if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) { 2774 if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) {
2775 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); 2775 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
2776 // encryption mode error 2776 // encryption mode error
2777 pMgmt->eCurrState = WMAC_STATE_IDLE; 2777 pMgmt->eCurrState = WMAC_STATE_IDLE;
2778 return; 2778 return;
2779 } 2779 }
2780 } else if (pDevice->eEncryptionStatus == Ndis802_11Encryption3Enabled) { 2780 } else if (pDevice->eEncryptionStatus == Ndis802_11Encryption3Enabled) {
2781 if (WPA_SearchRSN(0, WPA_AESCCMP, pCurr) == FALSE) { 2781 if (WPA_SearchRSN(0, WPA_AESCCMP, pCurr) == FALSE) {
2782 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); 2782 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
2783 // encryption mode error 2783 // encryption mode error
2784 pMgmt->eCurrState = WMAC_STATE_IDLE; 2784 pMgmt->eCurrState = WMAC_STATE_IDLE;
2785 return; 2785 return;
@@ -2866,10 +2866,10 @@ vMgrJoinBSSBegin(
2866 // This should only works for WPA2 BSS, and WPA2 BSS check must be done before. 2866 // This should only works for WPA2 BSS, and WPA2 BSS check must be done before.
2867 if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) { 2867 if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) {
2868 BOOL bResult = bAdd_PMKID_Candidate((HANDLE)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); 2868 BOOL bResult = bAdd_PMKID_Candidate((HANDLE)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
2869 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult); 2869 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult);
2870 if (bResult == FALSE) { 2870 if (bResult == FALSE) {
2871 vFlush_PMKID_Candidate((HANDLE)pDevice); 2871 vFlush_PMKID_Candidate((HANDLE)pDevice);
2872 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 4\n"); 2872 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 4\n");
2873 bAdd_PMKID_Candidate((HANDLE)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); 2873 bAdd_PMKID_Candidate((HANDLE)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
2874 } 2874 }
2875 } 2875 }
@@ -2877,11 +2877,11 @@ vMgrJoinBSSBegin(
2877 // Preamble type auto-switch: if AP can receive short-preamble cap, 2877 // Preamble type auto-switch: if AP can receive short-preamble cap,
2878 // we can turn on too. 2878 // we can turn on too.
2879 2879
2880 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join ESS\n"); 2880 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join ESS\n");
2881 2881
2882 2882
2883 2883
2884 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"End of Join AP -- A/B/G Action\n"); 2884 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"End of Join AP -- A/B/G Action\n");
2885 } 2885 }
2886 else { 2886 else {
2887 pMgmt->eCurrState = WMAC_STATE_IDLE; 2887 pMgmt->eCurrState = WMAC_STATE_IDLE;
@@ -2949,7 +2949,7 @@ vMgrJoinBSSBegin(
2949// pDevice->bLinkPass = TRUE; 2949// pDevice->bLinkPass = TRUE;
2950// memcpy(pDevice->abyBSSID, pCurr->abyBSSID, WLAN_BSSID_LEN); 2950// memcpy(pDevice->abyBSSID, pCurr->abyBSSID, WLAN_BSSID_LEN);
2951 2951
2952 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join IBSS ok:%02x-%02x-%02x-%02x-%02x-%02x \n", 2952 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join IBSS ok:%02x-%02x-%02x-%02x-%02x-%02x \n",
2953 pMgmt->abyCurrBSSID[0], 2953 pMgmt->abyCurrBSSID[0],
2954 pMgmt->abyCurrBSSID[1], 2954 pMgmt->abyCurrBSSID[1],
2955 pMgmt->abyCurrBSSID[2], 2955 pMgmt->abyCurrBSSID[2],
@@ -3008,7 +3008,7 @@ s_vMgrSynchBSS (
3008 pDevice->eEncryptionStatus, 3008 pDevice->eEncryptionStatus,
3009 &(pMgmt->byCSSPK), 3009 &(pMgmt->byCSSPK),
3010 &(pMgmt->byCSSGK)) == FALSE) { 3010 &(pMgmt->byCSSGK)) == FALSE) {
3011 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "s_bCipherMatch Fail .......\n"); 3011 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "s_bCipherMatch Fail .......\n");
3012 return; 3012 return;
3013 } 3013 }
3014 3014
@@ -3046,7 +3046,7 @@ s_vMgrSynchBSS (
3046 3046
3047 MACvReadBSSIDAddress(pDevice->PortOffset, pMgmt->abyCurrBSSID); 3047 MACvReadBSSIDAddress(pDevice->PortOffset, pMgmt->abyCurrBSSID);
3048 3048
3049 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:set CurrBSSID address = %02x-%02x-%02x=%02x-%02x-%02x\n", 3049 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:set CurrBSSID address = %02x-%02x-%02x=%02x-%02x-%02x\n",
3050 pMgmt->abyCurrBSSID[0], 3050 pMgmt->abyCurrBSSID[0],
3051 pMgmt->abyCurrBSSID[1], 3051 pMgmt->abyCurrBSSID[1],
3052 pMgmt->abyCurrBSSID[2], 3052 pMgmt->abyCurrBSSID[2],
@@ -3110,12 +3110,12 @@ s_vMgrSynchBSS (
3110 pMgmt->abyCurrSuppRates, 3110 pMgmt->abyCurrSuppRates,
3111 pMgmt->abyCurrExtSuppRates 3111 pMgmt->abyCurrExtSuppRates
3112 ) != TRUE) { 3112 ) != TRUE) {
3113 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Phy Mode Fail [%d]\n", ePhyType); 3113 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Phy Mode Fail [%d]\n", ePhyType);
3114 return; 3114 return;
3115 } 3115 }
3116 // set channel and clear NAV 3116 // set channel and clear NAV
3117 if (CARDbSetChannel(pMgmt->pAdapter, pCurr->uChannel) == FALSE) { 3117 if (CARDbSetChannel(pMgmt->pAdapter, pCurr->uChannel) == FALSE) {
3118 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Channel [%d]\n", pCurr->uChannel); 3118 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "<----s_bSynchBSS Set Channel [%d]\n", pCurr->uChannel);
3119 return; 3119 return;
3120 } 3120 }
3121 3121
@@ -3128,7 +3128,7 @@ s_vMgrSynchBSS (
3128 } 3128 }
3129 3129
3130 if (pDevice->byBBVGANew != pDevice->byBBVGACurrent) { 3130 if (pDevice->byBBVGANew != pDevice->byBBVGACurrent) {
3131 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RSSI[%d] NewGain[%d] OldGain[%d] \n", 3131 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"RSSI[%d] NewGain[%d] OldGain[%d] \n",
3132 (int)pCurr->ldBmMAX, pDevice->byBBVGANew, pDevice->byBBVGACurrent); 3132 (int)pCurr->ldBmMAX, pDevice->byBBVGANew, pDevice->byBBVGACurrent);
3133 printk("RSSI[%d] NewGain[%d] OldGain[%d] \n", 3133 printk("RSSI[%d] NewGain[%d] OldGain[%d] \n",
3134 (int)pCurr->ldBmMAX, pDevice->byBBVGANew, pDevice->byBBVGACurrent); 3134 (int)pCurr->ldBmMAX, pDevice->byBBVGANew, pDevice->byBBVGACurrent);
@@ -3140,7 +3140,7 @@ s_vMgrSynchBSS (
3140 pMgmt->uCurrChannel = pCurr->uChannel; 3140 pMgmt->uCurrChannel = pCurr->uChannel;
3141 pMgmt->eCurrentPHYMode = ePhyType; 3141 pMgmt->eCurrentPHYMode = ePhyType;
3142 pMgmt->byERPContext = pCurr->sERP.byERP; 3142 pMgmt->byERPContext = pCurr->sERP.byERP;
3143 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:Set to channel = [%d]\n", (INT)pCurr->uChannel); 3143 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:Set to channel = [%d]\n", (INT)pCurr->uChannel);
3144 3144
3145 3145
3146 *pStatus = CMD_STATUS_SUCCESS; 3146 *pStatus = CMD_STATUS_SUCCESS;
@@ -4395,13 +4395,13 @@ s_vMgrRxProbeResponse(
4395 (sFrame.pwCapInfo == 0) || 4395 (sFrame.pwCapInfo == 0) ||
4396 (sFrame.pSSID == 0) || 4396 (sFrame.pSSID == 0) ||
4397 (sFrame.pSuppRates == 0)) { 4397 (sFrame.pSuppRates == 0)) {
4398 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe resp:Fail addr:[%p] \n", pRxPacket->p80211Header); 4398 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe resp:Fail addr:[%p] \n", pRxPacket->p80211Header);
4399 DBG_PORT80(0xCC); 4399 DBG_PORT80(0xCC);
4400 return; 4400 return;
4401 }; 4401 };
4402 4402
4403 if(sFrame.pSSID->len == 0) 4403 if(sFrame.pSSID->len == 0)
4404 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx Probe resp: SSID len = 0 \n"); 4404 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx Probe resp: SSID len = 0 \n");
4405 4405
4406 if (sFrame.pDSParms != 0) { 4406 if (sFrame.pDSParms != 0) {
4407 if (byCurrChannel > CB_MAX_CHANNEL_24G) { 4407 if (byCurrChannel > CB_MAX_CHANNEL_24G) {
@@ -4457,7 +4457,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
4457 ); 4457 );
4458 } 4458 }
4459 else { 4459 else {
4460 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Probe resp/insert: RxChannel = : %d\n", byCurrChannel); 4460 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Probe resp/insert: RxChannel = : %d\n", byCurrChannel);
4461 BSSbInsertToBSSList((HANDLE)pDevice, 4461 BSSbInsertToBSSList((HANDLE)pDevice,
4462 sFrame.pHdr->sA3.abyAddr3, 4462 sFrame.pHdr->sA3.abyAddr3,
4463 *sFrame.pqwTimestamp, 4463 *sFrame.pqwTimestamp,
@@ -4517,7 +4517,7 @@ s_vMgrRxProbeRequest(
4517 sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; 4517 sFrame.pBuf = (PBYTE)pRxPacket->p80211Header;
4518 vMgrDecodeProbeRequest(&sFrame); 4518 vMgrDecodeProbeRequest(&sFrame);
4519/* 4519/*
4520 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request rx:MAC addr:%02x-%02x-%02x=%02x-%02x-%02x \n", 4520 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request rx:MAC addr:%02x-%02x-%02x=%02x-%02x-%02x \n",
4521 sFrame.pHdr->sA3.abyAddr2[0], 4521 sFrame.pHdr->sA3.abyAddr2[0],
4522 sFrame.pHdr->sA3.abyAddr2[1], 4522 sFrame.pHdr->sA3.abyAddr2[1],
4523 sFrame.pHdr->sA3.abyAddr2[2], 4523 sFrame.pHdr->sA3.abyAddr2[2],
@@ -4560,10 +4560,10 @@ s_vMgrRxProbeRequest(
4560 /* send the frame */ 4560 /* send the frame */
4561 Status = csMgmt_xmit(pDevice, pTxPacket); 4561 Status = csMgmt_xmit(pDevice, pTxPacket);
4562 if (Status != CMD_STATUS_PENDING) { 4562 if (Status != CMD_STATUS_PENDING) {
4563 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Probe response tx failed\n"); 4563 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Probe response tx failed\n");
4564 } 4564 }
4565 else { 4565 else {
4566// DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Probe response tx sending..\n"); 4566// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:Probe response tx sending..\n");
4567 } 4567 }
4568 } 4568 }
4569 } 4569 }
@@ -4613,7 +4613,7 @@ vMgrRxManagePacket(
4613 4613
4614 case WLAN_FSTYPE_ASSOCREQ: 4614 case WLAN_FSTYPE_ASSOCREQ:
4615 // Frame Clase = 2 4615 // Frame Clase = 2
4616 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocreq\n"); 4616 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocreq\n");
4617 if (eNodeState < NODE_AUTH) { 4617 if (eNodeState < NODE_AUTH) {
4618 // send deauth notification 4618 // send deauth notification
4619 // reason = (6) class 2 received from nonauth sta 4619 // reason = (6) class 2 received from nonauth sta
@@ -4623,7 +4623,7 @@ vMgrRxManagePacket(
4623 (6), 4623 (6),
4624 &Status 4624 &Status
4625 ); 4625 );
4626 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 1\n"); 4626 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 1\n");
4627 } 4627 }
4628 else { 4628 else {
4629 s_vMgrRxAssocRequest(pDevice, pMgmt, pRxPacket, uNodeIndex); 4629 s_vMgrRxAssocRequest(pDevice, pMgmt, pRxPacket, uNodeIndex);
@@ -4632,14 +4632,14 @@ vMgrRxManagePacket(
4632 4632
4633 case WLAN_FSTYPE_ASSOCRESP: 4633 case WLAN_FSTYPE_ASSOCRESP:
4634 // Frame Clase = 2 4634 // Frame Clase = 2
4635 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocresp1\n"); 4635 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocresp1\n");
4636 s_vMgrRxAssocResponse(pDevice, pMgmt, pRxPacket, FALSE); 4636 s_vMgrRxAssocResponse(pDevice, pMgmt, pRxPacket, FALSE);
4637 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocresp2\n"); 4637 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx assocresp2\n");
4638 break; 4638 break;
4639 4639
4640 case WLAN_FSTYPE_REASSOCREQ: 4640 case WLAN_FSTYPE_REASSOCREQ:
4641 // Frame Clase = 2 4641 // Frame Clase = 2
4642 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx reassocreq\n"); 4642 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx reassocreq\n");
4643 // Todo: reassoc 4643 // Todo: reassoc
4644 if (eNodeState < NODE_AUTH) { 4644 if (eNodeState < NODE_AUTH) {
4645 // send deauth notification 4645 // send deauth notification
@@ -4650,7 +4650,7 @@ vMgrRxManagePacket(
4650 (6), 4650 (6),
4651 &Status 4651 &Status
4652 ); 4652 );
4653 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 2\n"); 4653 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 2\n");
4654 4654
4655 } 4655 }
4656 s_vMgrRxReAssocRequest(pDevice, pMgmt, pRxPacket, uNodeIndex); 4656 s_vMgrRxReAssocRequest(pDevice, pMgmt, pRxPacket, uNodeIndex);
@@ -4658,26 +4658,26 @@ vMgrRxManagePacket(
4658 4658
4659 case WLAN_FSTYPE_REASSOCRESP: 4659 case WLAN_FSTYPE_REASSOCRESP:
4660 // Frame Clase = 2 4660 // Frame Clase = 2
4661 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx reassocresp\n"); 4661 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx reassocresp\n");
4662 s_vMgrRxAssocResponse(pDevice, pMgmt, pRxPacket, TRUE); 4662 s_vMgrRxAssocResponse(pDevice, pMgmt, pRxPacket, TRUE);
4663 break; 4663 break;
4664 4664
4665 case WLAN_FSTYPE_PROBEREQ: 4665 case WLAN_FSTYPE_PROBEREQ:
4666 // Frame Clase = 0 4666 // Frame Clase = 0
4667 //DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx probereq\n"); 4667 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx probereq\n");
4668 s_vMgrRxProbeRequest(pDevice, pMgmt, pRxPacket); 4668 s_vMgrRxProbeRequest(pDevice, pMgmt, pRxPacket);
4669 break; 4669 break;
4670 4670
4671 case WLAN_FSTYPE_PROBERESP: 4671 case WLAN_FSTYPE_PROBERESP:
4672 // Frame Clase = 0 4672 // Frame Clase = 0
4673 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx proberesp\n"); 4673 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx proberesp\n");
4674 4674
4675 s_vMgrRxProbeResponse(pDevice, pMgmt, pRxPacket); 4675 s_vMgrRxProbeResponse(pDevice, pMgmt, pRxPacket);
4676 break; 4676 break;
4677 4677
4678 case WLAN_FSTYPE_BEACON: 4678 case WLAN_FSTYPE_BEACON:
4679 // Frame Clase = 0 4679 // Frame Clase = 0
4680 // DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx beacon\n"); 4680 // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx beacon\n");
4681 if (pMgmt->eScanState != WMAC_NO_SCANNING) { 4681 if (pMgmt->eScanState != WMAC_NO_SCANNING) {
4682 bInScan = TRUE; 4682 bInScan = TRUE;
4683 }; 4683 };
@@ -4686,12 +4686,12 @@ vMgrRxManagePacket(
4686 4686
4687 case WLAN_FSTYPE_ATIM: 4687 case WLAN_FSTYPE_ATIM:
4688 // Frame Clase = 1 4688 // Frame Clase = 1
4689 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx atim\n"); 4689 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx atim\n");
4690 break; 4690 break;
4691 4691
4692 case WLAN_FSTYPE_DISASSOC: 4692 case WLAN_FSTYPE_DISASSOC:
4693 // Frame Clase = 2 4693 // Frame Clase = 2
4694 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx disassoc\n"); 4694 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx disassoc\n");
4695 if (eNodeState < NODE_AUTH) { 4695 if (eNodeState < NODE_AUTH) {
4696 // send deauth notification 4696 // send deauth notification
4697 // reason = (6) class 2 received from nonauth sta 4697 // reason = (6) class 2 received from nonauth sta
@@ -4701,25 +4701,25 @@ vMgrRxManagePacket(
4701 (6), 4701 (6),
4702 &Status 4702 &Status
4703 ); 4703 );
4704 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 3\n"); 4704 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wmgr: send vMgrDeAuthenBeginSta 3\n");
4705 } 4705 }
4706 s_vMgrRxDisassociation(pDevice, pMgmt, pRxPacket); 4706 s_vMgrRxDisassociation(pDevice, pMgmt, pRxPacket);
4707 break; 4707 break;
4708 4708
4709 case WLAN_FSTYPE_AUTHEN: 4709 case WLAN_FSTYPE_AUTHEN:
4710 // Frame Clase = 1 4710 // Frame Clase = 1
4711 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx authen\n"); 4711 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx authen\n");
4712 s_vMgrRxAuthentication(pDevice, pMgmt, pRxPacket); 4712 s_vMgrRxAuthentication(pDevice, pMgmt, pRxPacket);
4713 break; 4713 break;
4714 4714
4715 case WLAN_FSTYPE_DEAUTHEN: 4715 case WLAN_FSTYPE_DEAUTHEN:
4716 // Frame Clase = 1 4716 // Frame Clase = 1
4717 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx deauthen\n"); 4717 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx deauthen\n");
4718 s_vMgrRxDeauthentication(pDevice, pMgmt, pRxPacket); 4718 s_vMgrRxDeauthentication(pDevice, pMgmt, pRxPacket);
4719 break; 4719 break;
4720 4720
4721 default: 4721 default:
4722 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx unknown mgmt\n"); 4722 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx unknown mgmt\n");
4723 } 4723 }
4724 4724
4725 return; 4725 return;
@@ -4802,46 +4802,46 @@ s_vMgrLogStatus(
4802{ 4802{
4803 switch( wStatus ){ 4803 switch( wStatus ){
4804 case WLAN_MGMT_STATUS_UNSPEC_FAILURE: 4804 case WLAN_MGMT_STATUS_UNSPEC_FAILURE:
4805 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Unspecified error.\n"); 4805 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Unspecified error.\n");
4806 break; 4806 break;
4807 case WLAN_MGMT_STATUS_CAPS_UNSUPPORTED: 4807 case WLAN_MGMT_STATUS_CAPS_UNSUPPORTED:
4808 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Can't support all requested capabilities.\n"); 4808 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Can't support all requested capabilities.\n");
4809 break; 4809 break;
4810 case WLAN_MGMT_STATUS_REASSOC_NO_ASSOC: 4810 case WLAN_MGMT_STATUS_REASSOC_NO_ASSOC:
4811 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Reassoc denied, can't confirm original Association.\n"); 4811 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Reassoc denied, can't confirm original Association.\n");
4812 break; 4812 break;
4813 case WLAN_MGMT_STATUS_ASSOC_DENIED_UNSPEC: 4813 case WLAN_MGMT_STATUS_ASSOC_DENIED_UNSPEC:
4814 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, undefine in spec\n"); 4814 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, undefine in spec\n");
4815 break; 4815 break;
4816 case WLAN_MGMT_STATUS_UNSUPPORTED_AUTHALG: 4816 case WLAN_MGMT_STATUS_UNSUPPORTED_AUTHALG:
4817 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Peer doesn't support authen algorithm.\n"); 4817 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Peer doesn't support authen algorithm.\n");
4818 break; 4818 break;
4819 case WLAN_MGMT_STATUS_RX_AUTH_NOSEQ: 4819 case WLAN_MGMT_STATUS_RX_AUTH_NOSEQ:
4820 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Authen frame received out of sequence.\n"); 4820 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Authen frame received out of sequence.\n");
4821 break; 4821 break;
4822 case WLAN_MGMT_STATUS_CHALLENGE_FAIL: 4822 case WLAN_MGMT_STATUS_CHALLENGE_FAIL:
4823 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Authen rejected, challenge failure.\n"); 4823 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Authen rejected, challenge failure.\n");
4824 break; 4824 break;
4825 case WLAN_MGMT_STATUS_AUTH_TIMEOUT: 4825 case WLAN_MGMT_STATUS_AUTH_TIMEOUT:
4826 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Authen rejected, timeout waiting for next frame.\n"); 4826 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Authen rejected, timeout waiting for next frame.\n");
4827 break; 4827 break;
4828 case WLAN_MGMT_STATUS_ASSOC_DENIED_BUSY: 4828 case WLAN_MGMT_STATUS_ASSOC_DENIED_BUSY:
4829 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, AP too busy.\n"); 4829 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, AP too busy.\n");
4830 break; 4830 break;
4831 case WLAN_MGMT_STATUS_ASSOC_DENIED_RATES: 4831 case WLAN_MGMT_STATUS_ASSOC_DENIED_RATES:
4832 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we haven't enough basic rates.\n"); 4832 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we haven't enough basic rates.\n");
4833 break; 4833 break;
4834 case WLAN_MGMT_STATUS_ASSOC_DENIED_SHORTPREAMBLE: 4834 case WLAN_MGMT_STATUS_ASSOC_DENIED_SHORTPREAMBLE:
4835 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we do not support short preamble.\n"); 4835 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we do not support short preamble.\n");
4836 break; 4836 break;
4837 case WLAN_MGMT_STATUS_ASSOC_DENIED_PBCC: 4837 case WLAN_MGMT_STATUS_ASSOC_DENIED_PBCC:
4838 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we do not support PBCC.\n"); 4838 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we do not support PBCC.\n");
4839 break; 4839 break;
4840 case WLAN_MGMT_STATUS_ASSOC_DENIED_AGILITY: 4840 case WLAN_MGMT_STATUS_ASSOC_DENIED_AGILITY:
4841 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we do not support channel agility.\n"); 4841 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Status code == Assoc denied, we do not support channel agility.\n");
4842 break; 4842 break;
4843 default: 4843 default:
4844 DEVICE_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Unknown status code %d.\n", wStatus); 4844 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Unknown status code %d.\n", wStatus);
4845 break; 4845 break;
4846 } 4846 }
4847} 4847}
@@ -4874,7 +4874,7 @@ bAdd_PMKID_Candidate (
4874 PPMKID_CANDIDATE pCandidateList; 4874 PPMKID_CANDIDATE pCandidateList;
4875 UINT ii = 0; 4875 UINT ii = 0;
4876 4876
4877 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); 4877 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
4878 4878
4879 if ((pDevice == NULL) || (pbyBSSID == NULL) || (psRSNCapObj == NULL)) 4879 if ((pDevice == NULL) || (pbyBSSID == NULL) || (psRSNCapObj == NULL))
4880 return FALSE; 4880 return FALSE;
@@ -4906,7 +4906,7 @@ bAdd_PMKID_Candidate (
4906 } 4906 }
4907 MEMvCopy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN); 4907 MEMvCopy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN);
4908 pDevice->gsPMKIDCandidate.NumCandidates++; 4908 pDevice->gsPMKIDCandidate.NumCandidates++;
4909 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); 4909 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
4910 return TRUE; 4910 return TRUE;
4911} 4911}
4912 4912
@@ -5024,7 +5024,7 @@ s_bCipherMatch (
5024 } 5024 }
5025 } 5025 }
5026 5026
5027 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%d, %d, %d, %d, EncStatus:%d\n", 5027 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"%d, %d, %d, %d, EncStatus:%d\n",
5028 byMulticastCipher, byCipherMask, pBSSNode->bWPAValid, pBSSNode->bWPA2Valid, EncStatus); 5028 byMulticastCipher, byCipherMask, pBSSNode->bWPAValid, pBSSNode->bWPA2Valid, EncStatus);
5029 5029
5030 // mask our cap. with BSS 5030 // mask our cap. with BSS
diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c
index 87abae46472..93614a06efe 100644
--- a/drivers/staging/vt6655/wpa.c
+++ b/drivers/staging/vt6655/wpa.c
@@ -139,14 +139,14 @@ WPA_ParseRSN (
139 139
140 WPA_ClearRSN(pBSSList); 140 WPA_ClearRSN(pBSSList);
141 141
142 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA_ParseRSN: [%d]\n", pRSN->len); 142 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA_ParseRSN: [%d]\n", pRSN->len);
143 143
144 // information element header makes sense 144 // information element header makes sense
145 if ((pRSN->len >= 6) // oui1(4)+ver(2) 145 if ((pRSN->len >= 6) // oui1(4)+ver(2)
146 && (pRSN->byElementID == WLAN_EID_RSN_WPA) && MEMEqualMemory(pRSN->abyOUI, abyOUI01, 4) 146 && (pRSN->byElementID == WLAN_EID_RSN_WPA) && MEMEqualMemory(pRSN->abyOUI, abyOUI01, 4)
147 && (pRSN->wVersion == 1)) { 147 && (pRSN->wVersion == 1)) {
148 148
149 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Legal RSN\n"); 149 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Legal RSN\n");
150 // update each variable if pRSN is long enough to contain the variable 150 // update each variable if pRSN is long enough to contain the variable
151 if (pRSN->len >= 10) //oui1(4)+ver(2)+GKSuite(4) 151 if (pRSN->len >= 10) //oui1(4)+ver(2)+GKSuite(4)
152 { 152 {
@@ -164,13 +164,13 @@ WPA_ParseRSN (
164 // any vendor checks here 164 // any vendor checks here
165 pBSSList->byGKType = WPA_NONE; 165 pBSSList->byGKType = WPA_NONE;
166 166
167 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byGKType: %x\n", pBSSList->byGKType); 167 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byGKType: %x\n", pBSSList->byGKType);
168 } 168 }
169 169
170 if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2) 170 if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
171 { 171 {
172 j = 0; 172 j = 0;
173 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %ld\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType)); 173 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %ld\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
174 for(i = 0; (i < pRSN->wPKCount) && (j < sizeof(pBSSList->abyPKType)/sizeof(BYTE)); i++) { 174 for(i = 0; (i < pRSN->wPKCount) && (j < sizeof(pBSSList->abyPKType)/sizeof(BYTE)); i++) {
175 if(pRSN->len >= 12+i*4+4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*i) 175 if(pRSN->len >= 12+i*4+4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*i)
176 if (MEMEqualMemory(pRSN->PKSList[i].abyOUI, abyOUI00, 4)) 176 if (MEMEqualMemory(pRSN->PKSList[i].abyOUI, abyOUI00, 4))
@@ -190,18 +190,18 @@ WPA_ParseRSN (
190 //DBG_PRN_GRP14(("abyPKType[%d]: %X\n", j-1, pBSSList->abyPKType[j-1])); 190 //DBG_PRN_GRP14(("abyPKType[%d]: %X\n", j-1, pBSSList->abyPKType[j-1]));
191 } //for 191 } //for
192 pBSSList->wPKCount = (WORD)j; 192 pBSSList->wPKCount = (WORD)j;
193 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d\n", pBSSList->wPKCount); 193 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d\n", pBSSList->wPKCount);
194 } 194 }
195 195
196 m = pRSN->wPKCount; 196 m = pRSN->wPKCount;
197 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"m: %d\n", m); 197 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"m: %d\n", m);
198 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"14+m*4: %d\n", 14+m*4); 198 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"14+m*4: %d\n", 14+m*4);
199 199
200 if (pRSN->len >= 14+m*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2) 200 if (pRSN->len >= 14+m*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)
201 // overlay IE_RSN_Auth structure into correct place 201 // overlay IE_RSN_Auth structure into correct place
202 pIE_RSN_Auth = (PWLAN_IE_RSN_AUTH) pRSN->PKSList[m].abyOUI; 202 pIE_RSN_Auth = (PWLAN_IE_RSN_AUTH) pRSN->PKSList[m].abyOUI;
203 j = 0; 203 j = 0;
204 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %ld\n", 204 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %ld\n",
205 pIE_RSN_Auth->wAuthCount, sizeof(pBSSList->abyAuthType)); 205 pIE_RSN_Auth->wAuthCount, sizeof(pBSSList->abyAuthType));
206 for(i = 0; (i < pIE_RSN_Auth->wAuthCount) && (j < sizeof(pBSSList->abyAuthType)/sizeof(BYTE)); i++) { 206 for(i = 0; (i < pIE_RSN_Auth->wAuthCount) && (j < sizeof(pBSSList->abyAuthType)/sizeof(BYTE)); i++) {
207 if(pRSN->len >= 14+4+(m+i)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*i) 207 if(pRSN->len >= 14+4+(m+i)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*i)
@@ -219,15 +219,15 @@ WPA_ParseRSN (
219 } 219 }
220 if(j > 0) 220 if(j > 0)
221 pBSSList->wAuthCount = (WORD)j; 221 pBSSList->wAuthCount = (WORD)j;
222 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d\n", pBSSList->wAuthCount); 222 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d\n", pBSSList->wAuthCount);
223 } 223 }
224 224
225 if (pIE_RSN_Auth != NULL) { 225 if (pIE_RSN_Auth != NULL) {
226 226
227 n = pIE_RSN_Auth->wAuthCount; 227 n = pIE_RSN_Auth->wAuthCount;
228 228
229 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"n: %d\n", n); 229 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"n: %d\n", n);
230 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"14+4+(m+n)*4: %d\n", 14+4+(m+n)*4); 230 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"14+4+(m+n)*4: %d\n", 14+4+(m+n)*4);
231 231
232 if(pRSN->len+2 >= 14+4+(m+n)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*n)+Cap(2) 232 if(pRSN->len+2 >= 14+4+(m+n)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*n)+Cap(2)
233 pbyCaps = (PBYTE)pIE_RSN_Auth->AuthKSList[n].abyOUI; 233 pbyCaps = (PBYTE)pIE_RSN_Auth->AuthKSList[n].abyOUI;
diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c
index e2fdb331069..82c972dbfbf 100644
--- a/drivers/staging/vt6655/wpa2.c
+++ b/drivers/staging/vt6655/wpa2.c
@@ -127,7 +127,7 @@ WPA2vParseRSN (
127 PBYTE pbyOUI; 127 PBYTE pbyOUI;
128 BOOL bUseGK = FALSE; 128 BOOL bUseGK = FALSE;
129 129
130 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len); 130 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"WPA2_ParseRSN: [%d]\n", pRSN->len);
131 131
132 WPA2_ClearRSN(pBSSNode); 132 WPA2_ClearRSN(pBSSNode);
133 133
@@ -147,7 +147,7 @@ WPA2vParseRSN (
147 if ((pRSN->byElementID == WLAN_EID_RSN) && 147 if ((pRSN->byElementID == WLAN_EID_RSN) &&
148 (pRSN->wVersion == 1)) { 148 (pRSN->wVersion == 1)) {
149 149
150 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Legal 802.11i RSN\n"); 150 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Legal 802.11i RSN\n");
151 151
152 pbyOUI = &(pRSN->abyRSN[0]); 152 pbyOUI = &(pRSN->abyRSN[0]);
153 if (MEMEqualMemory(pbyOUI, abyOUIWEP40, 4)) 153 if (MEMEqualMemory(pbyOUI, abyOUIWEP40, 4))
@@ -165,7 +165,7 @@ WPA2vParseRSN (
165 // any vendor checks here 165 // any vendor checks here
166 pBSSNode->byCSSGK = WLAN_11i_CSS_UNKNOWN; 166 pBSSNode->byCSSGK = WLAN_11i_CSS_UNKNOWN;
167 167
168 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"802.11i CSS: %X\n", pBSSNode->byCSSGK); 168 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"802.11i CSS: %X\n", pBSSNode->byCSSGK);
169 169
170 if (pRSN->len == 6) { 170 if (pRSN->len == 6) {
171 pBSSNode->bWPA2Valid = TRUE; 171 pBSSNode->bWPA2Valid = TRUE;
@@ -199,7 +199,7 @@ WPA2vParseRSN (
199 pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_UNKNOWN; 199 pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_UNKNOWN;
200 } 200 }
201 pbyOUI += 4; 201 pbyOUI += 4;
202 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyCSSPK[%d]: %X\n", j-1, pBSSNode->abyCSSPK[j-1]); 202 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyCSSPK[%d]: %X\n", j-1, pBSSNode->abyCSSPK[j-1]);
203 } else 203 } else
204 break; 204 break;
205 } //for 205 } //for
@@ -219,7 +219,7 @@ WPA2vParseRSN (
219 return; 219 return;
220 } 220 }
221 pBSSNode->wCSSPKCount = (WORD)j; 221 pBSSNode->wCSSPKCount = (WORD)j;
222 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wCSSPKCount: %d\n", pBSSNode->wCSSPKCount); 222 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wCSSPKCount: %d\n", pBSSNode->wCSSPKCount);
223 } 223 }
224 224
225 m = *((PWORD) &(pRSN->abyRSN[4])); 225 m = *((PWORD) &(pRSN->abyRSN[4]));
@@ -237,12 +237,12 @@ WPA2vParseRSN (
237 else 237 else
238 // any vendor checks here 238 // any vendor checks here
239 pBSSNode->abyAKMSSAuthType[j++] = WLAN_11i_AKMSS_UNKNOWN; 239 pBSSNode->abyAKMSSAuthType[j++] = WLAN_11i_AKMSS_UNKNOWN;
240 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyAKMSSAuthType[%d]: %X\n", j-1, pBSSNode->abyAKMSSAuthType[j-1]); 240 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"abyAKMSSAuthType[%d]: %X\n", j-1, pBSSNode->abyAKMSSAuthType[j-1]);
241 } else 241 } else
242 break; 242 break;
243 } 243 }
244 pBSSNode->wAKMSSAuthCount = (WORD)j; 244 pBSSNode->wAKMSSAuthCount = (WORD)j;
245 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount); 245 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount);
246 246
247 n = *((PWORD) &(pRSN->abyRSN[6+4*m]));; 247 n = *((PWORD) &(pRSN->abyRSN[6+4*m]));;
248 if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2) 248 if (pRSN->len >= 12+4*m+4*n) { // ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2)
diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c
index cc4f0adb963..ec2839a70a2 100644
--- a/drivers/staging/vt6655/wpactl.c
+++ b/drivers/staging/vt6655/wpactl.c
@@ -130,7 +130,7 @@ static int wpa_init_wpadev(PSDevice pDevice)
130 pDevice->wpadev->mem_end = dev->mem_end; 130 pDevice->wpadev->mem_end = dev->mem_end;
131 ret = register_netdev(pDevice->wpadev); 131 ret = register_netdev(pDevice->wpadev);
132 if (ret) { 132 if (ret) {
133 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: register_netdev(WPA) failed!\n", 133 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: register_netdev(WPA) failed!\n",
134 dev->name); 134 dev->name);
135 free_netdev(pDevice->wpadev); 135 free_netdev(pDevice->wpadev);
136 return -1; 136 return -1;
@@ -142,7 +142,7 @@ static int wpa_init_wpadev(PSDevice pDevice)
142 return -ENOMEM; 142 return -ENOMEM;
143 } 143 }
144 144
145 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Registered netdev %s for WPA management\n", 145 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Registered netdev %s for WPA management\n",
146 dev->name, pDevice->wpadev->name); 146 dev->name, pDevice->wpadev->name);
147 147
148 return 0; 148 return 0;
@@ -171,7 +171,7 @@ static int wpa_release_wpadev(PSDevice pDevice)
171 } 171 }
172 172
173 if (pDevice->wpadev) { 173 if (pDevice->wpadev) {
174 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n", 174 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
175 pDevice->dev->name, pDevice->wpadev->name); 175 pDevice->dev->name, pDevice->wpadev->name);
176 unregister_netdev(pDevice->wpadev); 176 unregister_netdev(pDevice->wpadev);
177 free_netdev(pDevice->wpadev); 177 free_netdev(pDevice->wpadev);
@@ -241,7 +241,7 @@ int wpa_set_keys(PSDevice pDevice, void *ctx, BOOL fcpfkernel)
241 if (param->u.wpa_key.alg_name > WPA_ALG_CCMP) 241 if (param->u.wpa_key.alg_name > WPA_ALG_CCMP)
242 return -EINVAL; 242 return -EINVAL;
243 243
244 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "param->u.wpa_key.alg_name = %d \n", param->u.wpa_key.alg_name); 244 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "param->u.wpa_key.alg_name = %d \n", param->u.wpa_key.alg_name);
245 if (param->u.wpa_key.alg_name == WPA_ALG_NONE) { 245 if (param->u.wpa_key.alg_name == WPA_ALG_NONE) {
246 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; 246 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
247 pDevice->bEncryptionEnable = FALSE; 247 pDevice->bEncryptionEnable = FALSE;
@@ -322,7 +322,7 @@ spin_lock_irq(&pDevice->lock);
322 } 322 }
323 323
324 if (param->u.wpa_key.key_index >= MAX_GROUP_KEY) { 324 if (param->u.wpa_key.key_index >= MAX_GROUP_KEY) {
325 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "return dwKeyIndex > 3\n"); 325 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "return dwKeyIndex > 3\n");
326 return -EINVAL; 326 return -EINVAL;
327 } 327 }
328 328
@@ -365,7 +365,7 @@ spin_lock_irq(&pDevice->lock);
365 (param->u.wpa_key.key_len != MAX_KEY_LEN)) { 365 (param->u.wpa_key.key_len != MAX_KEY_LEN)) {
366 // TKIP Key must be 256 bits 366 // TKIP Key must be 256 bits
367 //DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA - TKIP Key must be 256 bits\n")); 367 //DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA - TKIP Key must be 256 bits\n"));
368 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "return- TKIP Key must be 256 bits!\n"); 368 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "return- TKIP Key must be 256 bits!\n");
369 return -EINVAL; 369 return -EINVAL;
370 } 370 }
371 // Check AES key length 371 // Check AES key length
@@ -379,7 +379,7 @@ spin_lock_irq(&pDevice->lock);
379 // spin_lock_irq(&pDevice->lock); 379 // spin_lock_irq(&pDevice->lock);
380 if (IS_BROADCAST_ADDRESS(&param->addr[0]) || (param->addr == NULL)) { 380 if (IS_BROADCAST_ADDRESS(&param->addr[0]) || (param->addr == NULL)) {
381 // If IS_BROADCAST_ADDRESS, set the key as every key entry's group key. 381 // If IS_BROADCAST_ADDRESS, set the key as every key entry's group key.
382 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Groupe Key Assign.\n"); 382 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Groupe Key Assign.\n");
383 383
384 if ((KeybSetAllGroupKey(&(pDevice->sKey), 384 if ((KeybSetAllGroupKey(&(pDevice->sKey),
385 dwKeyIndex, 385 dwKeyIndex,
@@ -397,7 +397,7 @@ spin_lock_irq(&pDevice->lock);
397 byKeyDecMode, 397 byKeyDecMode,
398 pDevice->PortOffset, 398 pDevice->PortOffset,
399 pDevice->byLocalID) == TRUE) ) { 399 pDevice->byLocalID) == TRUE) ) {
400 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "GROUP Key Assign.\n"); 400 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "GROUP Key Assign.\n");
401 401
402 } else { 402 } else {
403 //DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA -KeybSetDefaultKey Fail.0\n")); 403 //DBG_PRN_WLAN03(("return NDIS_STATUS_INVALID_DATA -KeybSetDefaultKey Fail.0\n"));
@@ -406,11 +406,11 @@ spin_lock_irq(&pDevice->lock);
406 } 406 }
407 407
408 } else { 408 } else {
409 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Assign.\n"); 409 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Assign.\n");
410 // BSSID not 0xffffffffffff 410 // BSSID not 0xffffffffffff
411 // Pairwise Key can't be WEP 411 // Pairwise Key can't be WEP
412 if (byKeyDecMode == KEY_CTL_WEP) { 412 if (byKeyDecMode == KEY_CTL_WEP) {
413 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key can't be WEP\n"); 413 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key can't be WEP\n");
414 //spin_unlock_irq(&pDevice->lock); 414 //spin_unlock_irq(&pDevice->lock);
415 return -EINVAL; 415 return -EINVAL;
416 } 416 }
@@ -430,7 +430,7 @@ spin_lock_irq(&pDevice->lock);
430 byKeyDecMode, 430 byKeyDecMode,
431 pDevice->PortOffset, 431 pDevice->PortOffset,
432 pDevice->byLocalID) == TRUE) { 432 pDevice->byLocalID) == TRUE) {
433 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Set\n"); 433 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Pairwise Key Set\n");
434 434
435 } else { 435 } else {
436 // Key Table Full 436 // Key Table Full
@@ -455,7 +455,7 @@ spin_lock_irq(&pDevice->lock);
455 //spin_unlock_irq(&pDevice->lock); 455 //spin_unlock_irq(&pDevice->lock);
456 456
457/* 457/*
458 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " key=%x-%x-%x-%x-%x-xxxxx \n", 458 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " key=%x-%x-%x-%x-%x-xxxxx \n",
459 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][0], 459 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][0],
460 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][1], 460 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][1],
461 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][2], 461 pMgmt->sNodeDBTable[iNodeIndex].abyWepKey[byKeyIndex][2],
@@ -752,7 +752,7 @@ static int wpa_get_scan(PSDevice pDevice,
752 ret = -EFAULT; 752 ret = -EFAULT;
753 }; 753 };
754 param->u.scan_results.scan_count = count; 754 param->u.scan_results.scan_count = count;
755 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO " param->u.scan_results.scan_count = %d\n", count) 755 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " param->u.scan_results.scan_count = %d\n", count)
756 756
757 kfree(pBuf); 757 kfree(pBuf);
758 return ret; 758 return ret;
@@ -785,12 +785,12 @@ static int wpa_set_associate(PSDevice pDevice,
785 BOOL bWepEnabled=FALSE; 785 BOOL bWepEnabled=FALSE;
786 786
787 // set key type & algorithm 787 // set key type & algorithm
788 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise_suite = %d\n", param->u.wpa_associate.pairwise_suite); 788 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pairwise_suite = %d\n", param->u.wpa_associate.pairwise_suite);
789 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "group_suite = %d\n", param->u.wpa_associate.group_suite); 789 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "group_suite = %d\n", param->u.wpa_associate.group_suite);
790 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "key_mgmt_suite = %d\n", param->u.wpa_associate.key_mgmt_suite); 790 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "key_mgmt_suite = %d\n", param->u.wpa_associate.key_mgmt_suite);
791 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "auth_alg = %d\n", param->u.wpa_associate.auth_alg); 791 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "auth_alg = %d\n", param->u.wpa_associate.auth_alg);
792 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "mode = %d\n", param->u.wpa_associate.mode); 792 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "mode = %d\n", param->u.wpa_associate.mode);
793 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ie_len = %d\n", param->u.wpa_associate.wpa_ie_len); 793 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ie_len = %d\n", param->u.wpa_associate.wpa_ie_len);
794 794
795 795
796 if (param->u.wpa_associate.wpa_ie && 796 if (param->u.wpa_associate.wpa_ie &&
@@ -943,59 +943,59 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p)
943 switch (param->cmd) { 943 switch (param->cmd) {
944 case VIAWGET_SET_WPA: 944 case VIAWGET_SET_WPA:
945 ret = wpa_set_wpa(pDevice, param); 945 ret = wpa_set_wpa(pDevice, param);
946 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_WPA \n"); 946 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_WPA \n");
947 break; 947 break;
948 948
949 case VIAWGET_SET_KEY: 949 case VIAWGET_SET_KEY:
950 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_KEY \n"); 950 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_KEY \n");
951 spin_lock_irq(&pDevice->lock); 951 spin_lock_irq(&pDevice->lock);
952 ret = wpa_set_keys(pDevice, param, FALSE); 952 ret = wpa_set_keys(pDevice, param, FALSE);
953 spin_unlock_irq(&pDevice->lock); 953 spin_unlock_irq(&pDevice->lock);
954 break; 954 break;
955 955
956 case VIAWGET_SET_SCAN: 956 case VIAWGET_SET_SCAN:
957 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_SCAN \n"); 957 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_SCAN \n");
958 ret = wpa_set_scan(pDevice, param); 958 ret = wpa_set_scan(pDevice, param);
959 break; 959 break;
960 960
961 case VIAWGET_GET_SCAN: 961 case VIAWGET_GET_SCAN:
962 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_SCAN\n"); 962 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_SCAN\n");
963 ret = wpa_get_scan(pDevice, param); 963 ret = wpa_get_scan(pDevice, param);
964 wpa_ioctl = 1; 964 wpa_ioctl = 1;
965 break; 965 break;
966 966
967 case VIAWGET_GET_SSID: 967 case VIAWGET_GET_SSID:
968 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_SSID \n"); 968 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_SSID \n");
969 ret = wpa_get_ssid(pDevice, param); 969 ret = wpa_get_ssid(pDevice, param);
970 wpa_ioctl = 1; 970 wpa_ioctl = 1;
971 break; 971 break;
972 972
973 case VIAWGET_GET_BSSID: 973 case VIAWGET_GET_BSSID:
974 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_BSSID \n"); 974 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_GET_BSSID \n");
975 ret = wpa_get_bssid(pDevice, param); 975 ret = wpa_get_bssid(pDevice, param);
976 wpa_ioctl = 1; 976 wpa_ioctl = 1;
977 break; 977 break;
978 978
979 case VIAWGET_SET_ASSOCIATE: 979 case VIAWGET_SET_ASSOCIATE:
980 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_ASSOCIATE \n"); 980 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_ASSOCIATE \n");
981 ret = wpa_set_associate(pDevice, param); 981 ret = wpa_set_associate(pDevice, param);
982 break; 982 break;
983 983
984 case VIAWGET_SET_DISASSOCIATE: 984 case VIAWGET_SET_DISASSOCIATE:
985 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DISASSOCIATE \n"); 985 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DISASSOCIATE \n");
986 ret = wpa_set_disassociate(pDevice, param); 986 ret = wpa_set_disassociate(pDevice, param);
987 break; 987 break;
988 988
989 case VIAWGET_SET_DROP_UNENCRYPT: 989 case VIAWGET_SET_DROP_UNENCRYPT:
990 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DROP_UNENCRYPT \n"); 990 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DROP_UNENCRYPT \n");
991 break; 991 break;
992 992
993 case VIAWGET_SET_DEAUTHENTICATE: 993 case VIAWGET_SET_DEAUTHENTICATE:
994 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DEAUTHENTICATE \n"); 994 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "VIAWGET_SET_DEAUTHENTICATE \n");
995 break; 995 break;
996 996
997 default: 997 default:
998 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ioctl: unknown cmd=%d\n", 998 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wpa_ioctl: unknown cmd=%d\n",
999 param->cmd); 999 param->cmd);
1000 return -EOPNOTSUPP; 1000 return -EOPNOTSUPP;
1001 break; 1001 break;
diff --git a/drivers/staging/vt6655/wroute.c b/drivers/staging/vt6655/wroute.c
index 219ae21654e..d16771e56d0 100644
--- a/drivers/staging/vt6655/wroute.c
+++ b/drivers/staging/vt6655/wroute.c
@@ -83,7 +83,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeI
83 PSTxDesc pHeadTD, pLastTD; 83 PSTxDesc pHeadTD, pLastTD;
84 UINT cbFrameBodySize; 84 UINT cbFrameBodySize;
85 UINT uMACfragNum; 85 UINT uMACfragNum;
86 BYTE byPktTyp; 86 BYTE byPktType;
87 BOOL bNeedEncryption = FALSE; 87 BOOL bNeedEncryption = FALSE;
88 SKeyItem STempKey; 88 SKeyItem STempKey;
89 PSKeyItem pTransmitKey = NULL; 89 PSKeyItem pTransmitKey = NULL;
@@ -95,7 +95,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeI
95 95
96 96
97 if (AVAIL_TD(pDevice, TYPE_AC0DMA)<=0) { 97 if (AVAIL_TD(pDevice, TYPE_AC0DMA)<=0) {
98 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Relay can't allocate TD1..\n"); 98 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Relay can't allocate TD1..\n");
99 return FALSE; 99 return FALSE;
100 } 100 }
101 101
@@ -118,9 +118,9 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeI
118 pbyBSSID = pDevice->abyBroadcastAddr; 118 pbyBSSID = pDevice->abyBroadcastAddr;
119 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) { 119 if(KeybGetTransmitKey(&(pDevice->sKey), pbyBSSID, GROUP_KEY, &pTransmitKey) == FALSE) {
120 pTransmitKey = NULL; 120 pTransmitKey = NULL;
121 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode); 121 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"KEY is NULL. [%d]\n", pDevice->pMgmt->eCurrMode);
122 } else { 122 } else {
123 DEVICE_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n"); 123 DBG_PRT(MSG_LEVEL_DEBUG, KERN_DEBUG"Get GTK.\n");
124 } 124 }
125 } 125 }
126 126
@@ -144,7 +144,7 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeI
144 if (uMACfragNum > AVAIL_TD(pDevice,TYPE_AC0DMA)) { 144 if (uMACfragNum > AVAIL_TD(pDevice,TYPE_AC0DMA)) {
145 return FALSE; 145 return FALSE;
146 } 146 }
147 byPktTyp = (BYTE)pDevice->byPacketType; 147 byPktType = (BYTE)pDevice->byPacketType;
148 148
149 if (pDevice->bFixRate) { 149 if (pDevice->bFixRate) {
150 if (pDevice->eCurrentPHYType == PHY_TYPE_11B) { 150 if (pDevice->eCurrentPHYType == PHY_TYPE_11B) {
@@ -170,9 +170,9 @@ BOOL ROUTEbRelay (PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeI
170 } 170 }
171 171
172 if (pDevice->wCurrentRate <= RATE_11M) 172 if (pDevice->wCurrentRate <= RATE_11M)
173 byPktTyp = PK_TYPE_11B; 173 byPktType = PK_TYPE_11B;
174 174
175 vGenerateFIFOHeader(pDevice, byPktTyp, pDevice->pbyTmpBuff, bNeedEncryption, 175 vGenerateFIFOHeader(pDevice, byPktType, pDevice->pbyTmpBuff, bNeedEncryption,
176 cbFrameBodySize, TYPE_AC0DMA, pHeadTD, 176 cbFrameBodySize, TYPE_AC0DMA, pHeadTD,
177 &pDevice->sTxEthHeader, pbySkbData, pTransmitKey, uNodeIndex, 177 &pDevice->sTxEthHeader, pbySkbData, pTransmitKey, uNodeIndex,
178 &uMACfragNum, 178 &uMACfragNum,
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 18:33:56 -0400