aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres More <more.andres@gmail.com>2010-05-17 20:34:01 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-18 17:51:08 -0400
commitcc856e61ee4ffb150ff352e3d6940978a2f819e8 (patch)
treefc196d675186aeaf221758a37c03ef5e305649fc
parent213d2e9322ed509c2f80b07d7feb4427ebcd7b0b (diff)
Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs
Cleared all checkpatch warnings but 'do not add new typedefs' ones. Signed-off-by: Andres More <more.andres@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/vt6656/80211mgr.h48
-rw-r--r--drivers/staging/vt6656/baseband.c52
-rw-r--r--drivers/staging/vt6656/baseband.h6
-rw-r--r--drivers/staging/vt6656/bssdb.c109
-rw-r--r--drivers/staging/vt6656/bssdb.h48
-rw-r--r--drivers/staging/vt6656/card.c14
-rw-r--r--drivers/staging/vt6656/card.h3
-rw-r--r--drivers/staging/vt6656/channel.c6
-rw-r--r--drivers/staging/vt6656/channel.h6
-rw-r--r--drivers/staging/vt6656/datarate.c14
-rw-r--r--drivers/staging/vt6656/datarate.h2
-rw-r--r--drivers/staging/vt6656/device.h157
-rw-r--r--drivers/staging/vt6656/dpc.c49
-rw-r--r--drivers/staging/vt6656/dpc.h2
-rw-r--r--drivers/staging/vt6656/hostap.c14
-rw-r--r--drivers/staging/vt6656/ioctl.c6
-rw-r--r--drivers/staging/vt6656/ioctl.h2
-rw-r--r--drivers/staging/vt6656/iwctl.c8
-rw-r--r--drivers/staging/vt6656/key.c22
-rw-r--r--drivers/staging/vt6656/key.h8
-rw-r--r--drivers/staging/vt6656/mac.c14
-rw-r--r--drivers/staging/vt6656/mac.h7
-rw-r--r--drivers/staging/vt6656/main_usb.c50
-rw-r--r--drivers/staging/vt6656/mib.c43
-rw-r--r--drivers/staging/vt6656/mib.h171
-rw-r--r--drivers/staging/vt6656/michael.c8
-rw-r--r--drivers/staging/vt6656/michael.h2
-rw-r--r--drivers/staging/vt6656/rc4.c22
-rw-r--r--drivers/staging/vt6656/rc4.h11
-rw-r--r--drivers/staging/vt6656/rf.c6
-rw-r--r--drivers/staging/vt6656/rf.h6
-rw-r--r--drivers/staging/vt6656/rxtx.c234
-rw-r--r--drivers/staging/vt6656/rxtx.h17
-rw-r--r--drivers/staging/vt6656/tcrc.c6
-rw-r--r--drivers/staging/vt6656/tcrc.h6
-rw-r--r--drivers/staging/vt6656/tether.c2
-rw-r--r--drivers/staging/vt6656/tether.h2
-rw-r--r--drivers/staging/vt6656/ttype.h6
-rw-r--r--drivers/staging/vt6656/upc.h2
-rw-r--r--drivers/staging/vt6656/usbpipe.c15
-rw-r--r--drivers/staging/vt6656/wcmd.c18
-rw-r--r--drivers/staging/vt6656/wctl.c17
-rw-r--r--drivers/staging/vt6656/wctl.h8
-rw-r--r--drivers/staging/vt6656/wmgr.c69
-rw-r--r--drivers/staging/vt6656/wmgr.h62
-rw-r--r--drivers/staging/vt6656/wpa2.c4
-rw-r--r--drivers/staging/vt6656/wpa2.h4
-rw-r--r--drivers/staging/vt6656/wpactl.h4
48 files changed, 700 insertions, 692 deletions
diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h
index 50982e9f8cdf..c140a957d9df 100644
--- a/drivers/staging/vt6656/80211mgr.h
+++ b/drivers/staging/vt6656/80211mgr.h
@@ -524,8 +524,8 @@ typedef struct _WLAN_IE_IBSS_DFS {
524// prototype structure, all mgmt frame types will start with these members 524// prototype structure, all mgmt frame types will start with these members
525typedef struct tagWLAN_FR_MGMT { 525typedef struct tagWLAN_FR_MGMT {
526 526
527 UINT uType; 527 unsigned int uType;
528 UINT len; 528 unsigned int len;
529 PBYTE pBuf; 529 PBYTE pBuf;
530 PUWLAN_80211HDR pHdr; 530 PUWLAN_80211HDR pHdr;
531 531
@@ -534,8 +534,8 @@ typedef struct tagWLAN_FR_MGMT {
534// Beacon frame 534// Beacon frame
535typedef struct tagWLAN_FR_BEACON { 535typedef struct tagWLAN_FR_BEACON {
536 536
537 UINT uType; 537 unsigned int uType;
538 UINT len; 538 unsigned int len;
539 PBYTE pBuf; 539 PBYTE pBuf;
540 PUWLAN_80211HDR pHdr; 540 PUWLAN_80211HDR pHdr;
541 // fixed fields 541 // fixed fields
@@ -566,8 +566,8 @@ typedef struct tagWLAN_FR_BEACON {
566// IBSS ATIM frame 566// IBSS ATIM frame
567typedef struct tagWLAN_FR_IBSSATIM { 567typedef struct tagWLAN_FR_IBSSATIM {
568 568
569 UINT uType; 569 unsigned int uType;
570 UINT len; 570 unsigned int len;
571 PBYTE pBuf; 571 PBYTE pBuf;
572 PUWLAN_80211HDR pHdr; 572 PUWLAN_80211HDR pHdr;
573 573
@@ -580,8 +580,8 @@ typedef struct tagWLAN_FR_IBSSATIM {
580// Disassociation 580// Disassociation
581typedef struct tagWLAN_FR_DISASSOC { 581typedef struct tagWLAN_FR_DISASSOC {
582 582
583 UINT uType; 583 unsigned int uType;
584 UINT len; 584 unsigned int len;
585 PBYTE pBuf; 585 PBYTE pBuf;
586 PUWLAN_80211HDR pHdr; 586 PUWLAN_80211HDR pHdr;
587 /*-- fixed fields -----------*/ 587 /*-- fixed fields -----------*/
@@ -593,8 +593,8 @@ typedef struct tagWLAN_FR_DISASSOC {
593// Association Request 593// Association Request
594typedef struct tagWLAN_FR_ASSOCREQ { 594typedef struct tagWLAN_FR_ASSOCREQ {
595 595
596 UINT uType; 596 unsigned int uType;
597 UINT len; 597 unsigned int len;
598 PBYTE pBuf; 598 PBYTE pBuf;
599 PUWLAN_80211HDR pHdr; 599 PUWLAN_80211HDR pHdr;
600 /*-- fixed fields -----------*/ 600 /*-- fixed fields -----------*/
@@ -617,8 +617,8 @@ typedef struct tagWLAN_FR_ASSOCREQ {
617// Association Response 617// Association Response
618typedef struct tagWLAN_FR_ASSOCRESP { 618typedef struct tagWLAN_FR_ASSOCRESP {
619 619
620 UINT uType; 620 unsigned int uType;
621 UINT len; 621 unsigned int len;
622 PBYTE pBuf; 622 PBYTE pBuf;
623 PUWLAN_80211HDR pHdr; 623 PUWLAN_80211HDR pHdr;
624 /*-- fixed fields -----------*/ 624 /*-- fixed fields -----------*/
@@ -634,8 +634,8 @@ typedef struct tagWLAN_FR_ASSOCRESP {
634// Reassociation Request 634// Reassociation Request
635typedef struct tagWLAN_FR_REASSOCREQ { 635typedef struct tagWLAN_FR_REASSOCREQ {
636 636
637 UINT uType; 637 unsigned int uType;
638 UINT len; 638 unsigned int len;
639 PBYTE pBuf; 639 PBYTE pBuf;
640 PUWLAN_80211HDR pHdr; 640 PUWLAN_80211HDR pHdr;
641 641
@@ -659,8 +659,8 @@ typedef struct tagWLAN_FR_REASSOCREQ {
659// Reassociation Response 659// Reassociation Response
660typedef struct tagWLAN_FR_REASSOCRESP { 660typedef struct tagWLAN_FR_REASSOCRESP {
661 661
662 UINT uType; 662 unsigned int uType;
663 UINT len; 663 unsigned int len;
664 PBYTE pBuf; 664 PBYTE pBuf;
665 PUWLAN_80211HDR pHdr; 665 PUWLAN_80211HDR pHdr;
666 /*-- fixed fields -----------*/ 666 /*-- fixed fields -----------*/
@@ -676,8 +676,8 @@ typedef struct tagWLAN_FR_REASSOCRESP {
676// Probe Request 676// Probe Request
677typedef struct tagWLAN_FR_PROBEREQ { 677typedef struct tagWLAN_FR_PROBEREQ {
678 678
679 UINT uType; 679 unsigned int uType;
680 UINT len; 680 unsigned int len;
681 PBYTE pBuf; 681 PBYTE pBuf;
682 PUWLAN_80211HDR pHdr; 682 PUWLAN_80211HDR pHdr;
683 /*-- fixed fields -----------*/ 683 /*-- fixed fields -----------*/
@@ -691,8 +691,8 @@ typedef struct tagWLAN_FR_PROBEREQ {
691// Probe Response 691// Probe Response
692typedef struct tagWLAN_FR_PROBERESP { 692typedef struct tagWLAN_FR_PROBERESP {
693 693
694 UINT uType; 694 unsigned int uType;
695 UINT len; 695 unsigned int len;
696 PBYTE pBuf; 696 PBYTE pBuf;
697 PUWLAN_80211HDR pHdr; 697 PUWLAN_80211HDR pHdr;
698 /*-- fixed fields -----------*/ 698 /*-- fixed fields -----------*/
@@ -720,8 +720,8 @@ typedef struct tagWLAN_FR_PROBERESP {
720// Authentication 720// Authentication
721typedef struct tagWLAN_FR_AUTHEN { 721typedef struct tagWLAN_FR_AUTHEN {
722 722
723 UINT uType; 723 unsigned int uType;
724 UINT len; 724 unsigned int len;
725 PBYTE pBuf; 725 PBYTE pBuf;
726 PUWLAN_80211HDR pHdr; 726 PUWLAN_80211HDR pHdr;
727 /*-- fixed fields -----------*/ 727 /*-- fixed fields -----------*/
@@ -736,8 +736,8 @@ typedef struct tagWLAN_FR_AUTHEN {
736// Deauthenication 736// Deauthenication
737typedef struct tagWLAN_FR_DEAUTHEN { 737typedef struct tagWLAN_FR_DEAUTHEN {
738 738
739 UINT uType; 739 unsigned int uType;
740 UINT len; 740 unsigned int len;
741 PBYTE pBuf; 741 PBYTE pBuf;
742 PUWLAN_80211HDR pHdr; 742 PUWLAN_80211HDR pHdr;
743 /*-- fixed fields -----------*/ 743 /*-- fixed fields -----------*/
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 01680e6b0f5b..d3de94f36c6e 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -662,11 +662,11 @@ const WORD awcFrameTime[MAX_RATE] =
662 662
663/* 663/*
664static 664static
665ULONG 665unsigned long
666s_ulGetLowSQ3(PSDevice pDevice); 666s_ulGetLowSQ3(PSDevice pDevice);
667 667
668static 668static
669ULONG 669unsigned long
670s_ulGetRatio(PSDevice pDevice); 670s_ulGetRatio(PSDevice pDevice);
671 671
672static 672static
@@ -689,19 +689,19 @@ s_vClearSQ3Value(PSDevice pDevice);
689 * Return Value: FrameTime 689 * Return Value: FrameTime
690 * 690 *
691 */ 691 */
692UINT 692unsigned int
693BBuGetFrameTime ( 693BBuGetFrameTime (
694 BYTE byPreambleType, 694 BYTE byPreambleType,
695 BYTE byPktType, 695 BYTE byPktType,
696 UINT cbFrameLength, 696 unsigned int cbFrameLength,
697 WORD wRate 697 WORD wRate
698 ) 698 )
699{ 699{
700 UINT uFrameTime; 700 unsigned int uFrameTime;
701 UINT uPreamble; 701 unsigned int uPreamble;
702 UINT uTmp; 702 unsigned int uTmp;
703 UINT uRateIdx = (UINT)wRate; 703 unsigned int uRateIdx = (unsigned int)wRate;
704 UINT uRate = 0; 704 unsigned int uRate = 0;
705 705
706 706
707 if (uRateIdx > RATE_54M) { 707 if (uRateIdx > RATE_54M) {
@@ -709,7 +709,7 @@ BBuGetFrameTime (
709 return 0; 709 return 0;
710 } 710 }
711 711
712 uRate = (UINT)awcFrameTime[uRateIdx]; 712 uRate = (unsigned int)awcFrameTime[uRateIdx];
713 713
714 if (uRateIdx <= 3) { //CCK mode 714 if (uRateIdx <= 3) { //CCK mode
715 715
@@ -759,7 +759,7 @@ BBuGetFrameTime (
759void 759void
760BBvCaculateParameter ( 760BBvCaculateParameter (
761 PSDevice pDevice, 761 PSDevice pDevice,
762 UINT cbFrameLength, 762 unsigned int cbFrameLength,
763 WORD wRate, 763 WORD wRate,
764 BYTE byPacketType, 764 BYTE byPacketType,
765 PWORD pwPhyLen, 765 PWORD pwPhyLen,
@@ -767,9 +767,9 @@ BBvCaculateParameter (
767 PBYTE pbyPhySgn 767 PBYTE pbyPhySgn
768 ) 768 )
769{ 769{
770 UINT cbBitCount; 770 unsigned int cbBitCount;
771 UINT cbUsCount = 0; 771 unsigned int cbUsCount = 0;
772 UINT cbTmp; 772 unsigned int cbTmp;
773 BOOL bExtBit; 773 BOOL bExtBit;
774 BYTE byPreambleType = pDevice->byPreambleType; 774 BYTE byPreambleType = pDevice->byPreambleType;
775 BOOL bCCK = pDevice->bCCK; 775 BOOL bCCK = pDevice->bCCK;
@@ -1360,13 +1360,11 @@ BBvExitDeepSleep (PSDevice pDevice)
1360} 1360}
1361 1361
1362 1362
1363static 1363static unsigned long s_ulGetLowSQ3(PSDevice pDevice)
1364ULONG
1365s_ulGetLowSQ3(PSDevice pDevice)
1366{ 1364{
1367int ii; 1365 int ii;
1368ULONG ulSQ3 = 0; 1366 unsigned long ulSQ3 = 0;
1369ULONG ulMaxPacket; 1367 unsigned long ulMaxPacket;
1370 1368
1371 ulMaxPacket = pDevice->aulPktNum[RATE_54M]; 1369 ulMaxPacket = pDevice->aulPktNum[RATE_54M];
1372 if ( pDevice->aulPktNum[RATE_54M] != 0 ) { 1370 if ( pDevice->aulPktNum[RATE_54M] != 0 ) {
@@ -1382,16 +1380,12 @@ ULONG ulMaxPacket;
1382 return ulSQ3; 1380 return ulSQ3;
1383} 1381}
1384 1382
1385 1383static unsigned long s_ulGetRatio(PSDevice pDevice)
1386
1387static
1388ULONG
1389s_ulGetRatio (PSDevice pDevice)
1390{ 1384{
1391int ii,jj; 1385 int ii, jj;
1392ULONG ulRatio = 0; 1386 unsigned long ulRatio = 0;
1393ULONG ulMaxPacket; 1387 unsigned long ulMaxPacket;
1394ULONG ulPacketNum; 1388 unsigned long ulPacketNum;
1395 1389
1396 //This is a thousand-ratio 1390 //This is a thousand-ratio
1397 ulMaxPacket = pDevice->aulPktNum[RATE_54M]; 1391 ulMaxPacket = pDevice->aulPktNum[RATE_54M];
diff --git a/drivers/staging/vt6656/baseband.h b/drivers/staging/vt6656/baseband.h
index d59992c17ec8..bc4633d5fead 100644
--- a/drivers/staging/vt6656/baseband.h
+++ b/drivers/staging/vt6656/baseband.h
@@ -96,18 +96,18 @@
96 96
97/*--------------------- Export Functions --------------------------*/ 97/*--------------------- Export Functions --------------------------*/
98 98
99UINT 99unsigned int
100BBuGetFrameTime( 100BBuGetFrameTime(
101 BYTE byPreambleType, 101 BYTE byPreambleType,
102 BYTE byFreqType, 102 BYTE byFreqType,
103 UINT cbFrameLength, 103 unsigned int cbFrameLength,
104 WORD wRate 104 WORD wRate
105 ); 105 );
106 106
107void 107void
108BBvCaculateParameter ( 108BBvCaculateParameter (
109 PSDevice pDevice, 109 PSDevice pDevice,
110 UINT cbFrameLength, 110 unsigned int cbFrameLength,
111 WORD wRate, 111 WORD wRate,
112 BYTE byPacketType, 112 BYTE byPacketType,
113 PWORD pwPhyLen, 113 PWORD pwPhyLen,
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index a10c46339add..36ed61b595ca 100644
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -129,8 +129,8 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
129 PKnownBSS pCurrBSS = NULL; 129 PKnownBSS pCurrBSS = NULL;
130 PKnownBSS pSelect = NULL; 130 PKnownBSS pSelect = NULL;
131 BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00}; 131 BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};
132 UINT ii = 0; 132 unsigned int ii = 0;
133 UINT jj = 0; //DavidWang 133 unsigned int jj = 0;
134 if (pbyDesireBSSID != NULL) { 134 if (pbyDesireBSSID != NULL) {
135 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n", 135 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",
136 *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2), 136 *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),
@@ -291,7 +291,7 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID)
291{ 291{
292 PSDevice pDevice = (PSDevice)hDeviceContext; 292 PSDevice pDevice = (PSDevice)hDeviceContext;
293 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 293 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
294 UINT ii; 294 unsigned int ii;
295 295
296 for (ii = 0; ii < MAX_BSS_NUM; ii++) { 296 for (ii = 0; ii < MAX_BSS_NUM; ii++) {
297 if (bKeepCurrBSSID) { 297 if (bKeepCurrBSSID) {
@@ -336,7 +336,7 @@ PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext,
336 PSDevice pDevice = (PSDevice)hDeviceContext; 336 PSDevice pDevice = (PSDevice)hDeviceContext;
337 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 337 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
338 PKnownBSS pBSSList = NULL; 338 PKnownBSS pBSSList = NULL;
339 UINT ii; 339 unsigned int ii;
340 340
341 for (ii = 0; ii < MAX_BSS_NUM; ii++) { 341 for (ii = 0; ii < MAX_BSS_NUM; ii++) {
342 pBSSList = &(pMgmt->sBSSList[ii]); 342 pBSSList = &(pMgmt->sBSSList[ii]);
@@ -381,7 +381,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext,
381 PWLAN_IE_RSN_EXT pRSNWPA, 381 PWLAN_IE_RSN_EXT pRSNWPA,
382 PWLAN_IE_COUNTRY pIE_Country, 382 PWLAN_IE_COUNTRY pIE_Country,
383 PWLAN_IE_QUIET pIE_Quiet, 383 PWLAN_IE_QUIET pIE_Quiet,
384 UINT uIELength, 384 unsigned int uIELength,
385 PBYTE pbyIEs, 385 PBYTE pbyIEs,
386 void *pRxPacketContext) 386 void *pRxPacketContext)
387{ 387{
@@ -390,7 +390,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext,
390 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 390 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
391 PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; 391 PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
392 PKnownBSS pBSSList = NULL; 392 PKnownBSS pBSSList = NULL;
393 UINT ii; 393 unsigned int ii;
394 BOOL bParsingQuiet = FALSE; 394 BOOL bParsingQuiet = FALSE;
395 395
396 396
@@ -465,24 +465,27 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext,
465 WPA_ClearRSN(pBSSList); 465 WPA_ClearRSN(pBSSList);
466 466
467 if (pRSNWPA != NULL) { 467 if (pRSNWPA != NULL) {
468 UINT uLen = pRSNWPA->len + 2; 468 unsigned int uLen = pRSNWPA->len + 2;
469 469
470 if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { 470 if (uLen <= (uIELength -
471 pBSSList->wWPALen = uLen; 471 (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) {
472 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); 472 pBSSList->wWPALen = uLen;
473 WPA_ParseRSN(pBSSList, pRSNWPA); 473 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
474 } 474 WPA_ParseRSN(pBSSList, pRSNWPA);
475 }
475 } 476 }
476 477
477 WPA2_ClearRSN(pBSSList); 478 WPA2_ClearRSN(pBSSList);
478 479
479 if (pRSN != NULL) { 480 if (pRSN != NULL) {
480 UINT uLen = pRSN->len + 2; 481 unsigned int uLen = pRSN->len + 2;
481 if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { 482
482 pBSSList->wRSNLen = uLen; 483 if (uLen <= (uIELength -
483 memcpy(pBSSList->byRSNIE, pRSN, uLen); 484 (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) {
484 WPA2vParseRSN(pBSSList, pRSN); 485 pBSSList->wRSNLen = uLen;
485 } 486 memcpy(pBSSList->byRSNIE, pRSN, uLen);
487 WPA2vParseRSN(pBSSList, pRSN);
488 }
486 } 489 }
487 490
488 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == TRUE)) { 491 if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == TRUE)) {
@@ -600,7 +603,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
600 PWLAN_IE_COUNTRY pIE_Country, 603 PWLAN_IE_COUNTRY pIE_Country,
601 PWLAN_IE_QUIET pIE_Quiet, 604 PWLAN_IE_QUIET pIE_Quiet,
602 PKnownBSS pBSSList, 605 PKnownBSS pBSSList,
603 UINT uIELength, 606 unsigned int uIELength,
604 PBYTE pbyIEs, 607 PBYTE pbyIEs,
605 void *pRxPacketContext) 608 void *pRxPacketContext)
606{ 609{
@@ -667,24 +670,26 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
667 670
668 WPA_ClearRSN(pBSSList); //mike update 671 WPA_ClearRSN(pBSSList); //mike update
669 672
670 if (pRSNWPA != NULL) { 673 if (pRSNWPA != NULL) {
671 UINT uLen = pRSNWPA->len + 2; 674 unsigned int uLen = pRSNWPA->len + 2;
672 if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { 675 if (uLen <= (uIELength -
673 pBSSList->wWPALen = uLen; 676 (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) {
674 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); 677 pBSSList->wWPALen = uLen;
675 WPA_ParseRSN(pBSSList, pRSNWPA); 678 memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);
676 } 679 WPA_ParseRSN(pBSSList, pRSNWPA);
677 } 680 }
681 }
678 682
679 WPA2_ClearRSN(pBSSList); //mike update 683 WPA2_ClearRSN(pBSSList); //mike update
680 684
681 if (pRSN != NULL) { 685 if (pRSN != NULL) {
682 UINT uLen = pRSN->len + 2; 686 unsigned int uLen = pRSN->len + 2;
683 if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { 687 if (uLen <= (uIELength -
684 pBSSList->wRSNLen = uLen; 688 (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) {
685 memcpy(pBSSList->byRSNIE, pRSN, uLen); 689 pBSSList->wRSNLen = uLen;
686 WPA2vParseRSN(pBSSList, pRSN); 690 memcpy(pBSSList->byRSNIE, pRSN, uLen);
687 } 691 WPA2vParseRSN(pBSSList, pRSN);
692 }
688 } 693 }
689 694
690 if (pRxPacket->uRSSI != 0) { 695 if (pRxPacket->uRSSI != 0) {
@@ -754,7 +759,7 @@ BOOL BSSbIsSTAInNodeDB(void *hDeviceContext,
754{ 759{
755 PSDevice pDevice = (PSDevice)hDeviceContext; 760 PSDevice pDevice = (PSDevice)hDeviceContext;
756 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 761 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
757 UINT ii; 762 unsigned int ii;
758 763
759 // Index = 0 reserved for AP Node 764 // Index = 0 reserved for AP Node
760 for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) { 765 for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
@@ -786,9 +791,9 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex)
786 791
787 PSDevice pDevice = (PSDevice)hDeviceContext; 792 PSDevice pDevice = (PSDevice)hDeviceContext;
788 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 793 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
789 UINT ii; 794 unsigned int ii;
790 UINT BigestCount = 0; 795 unsigned int BigestCount = 0;
791 UINT SelectIndex; 796 unsigned int SelectIndex;
792 struct sk_buff *skb; 797 struct sk_buff *skb;
793 // Index = 0 reserved for AP Node (In STA mode) 798 // Index = 0 reserved for AP Node (In STA mode)
794 // Index = 0 reserved for Broadcast/MultiCast (In AP mode) 799 // Index = 0 reserved for Broadcast/MultiCast (In AP mode)
@@ -843,7 +848,7 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex)
843 * 848 *
844-*/ 849-*/
845 850
846void BSSvRemoveOneNode(void *hDeviceContext, UINT uNodeIndex) 851void BSSvRemoveOneNode(void *hDeviceContext, unsigned int uNodeIndex)
847{ 852{
848 853
849 PSDevice pDevice = (PSDevice)hDeviceContext; 854 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -879,7 +884,7 @@ void BSSvUpdateAPNode(void *hDeviceContext,
879{ 884{
880 PSDevice pDevice = (PSDevice)hDeviceContext; 885 PSDevice pDevice = (PSDevice)hDeviceContext;
881 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 886 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
882 UINT uRateLen = WLAN_RATES_MAXLEN; 887 unsigned int uRateLen = WLAN_RATES_MAXLEN;
883 888
884 memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB)); 889 memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
885 890
@@ -967,11 +972,11 @@ void BSSvSecondCallBack(void *hDeviceContext)
967{ 972{
968 PSDevice pDevice = (PSDevice)hDeviceContext; 973 PSDevice pDevice = (PSDevice)hDeviceContext;
969 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 974 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
970 UINT ii; 975 unsigned int ii;
971 PWLAN_IE_SSID pItemSSID, pCurrSSID; 976 PWLAN_IE_SSID pItemSSID, pCurrSSID;
972 UINT uSleepySTACnt = 0; 977 unsigned int uSleepySTACnt = 0;
973 UINT uNonShortSlotSTACnt = 0; 978 unsigned int uNonShortSlotSTACnt = 0;
974 UINT uLongPreambleSTACnt = 0; 979 unsigned int uLongPreambleSTACnt = 0;
975 viawget_wpa_header *wpahdr; //DavidWang 980 viawget_wpa_header *wpahdr; //DavidWang
976 981
977 spin_lock_irq(&pDevice->lock); 982 spin_lock_irq(&pDevice->lock);
@@ -1360,12 +1365,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext,
1360{ 1365{
1361 PSDevice pDevice = (PSDevice)hDeviceContext; 1366 PSDevice pDevice = (PSDevice)hDeviceContext;
1362 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1367 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1363 UINT uNodeIndex = 0; 1368 unsigned int uNodeIndex = 0;
1364 BYTE byTxRetry; 1369 BYTE byTxRetry;
1365 WORD wRate; 1370 WORD wRate;
1366 WORD wFallBackRate = RATE_1M; 1371 WORD wFallBackRate = RATE_1M;
1367 BYTE byFallBack; 1372 BYTE byFallBack;
1368 UINT ii; 1373 unsigned int ii;
1369 PBYTE pbyDestAddr; 1374 PBYTE pbyDestAddr;
1370 BYTE byPktNum; 1375 BYTE byPktNum;
1371 WORD wFIFOCtl; 1376 WORD wFIFOCtl;
@@ -1516,12 +1521,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext,
1516-*/ 1521-*/
1517 1522
1518void BSSvClearNodeDBTable(void *hDeviceContext, 1523void BSSvClearNodeDBTable(void *hDeviceContext,
1519 UINT uStartIndex) 1524 unsigned int uStartIndex)
1520{ 1525{
1521 PSDevice pDevice = (PSDevice)hDeviceContext; 1526 PSDevice pDevice = (PSDevice)hDeviceContext;
1522 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1527 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1523 struct sk_buff *skb; 1528 struct sk_buff *skb;
1524 UINT ii; 1529 unsigned int ii;
1525 1530
1526 for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) { 1531 for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) {
1527 if (pMgmt->sNodeDBTable[ii].bActive) { 1532 if (pMgmt->sNodeDBTable[ii].bActive) {
@@ -1586,9 +1591,9 @@ void s_vCheckSensitivity(void *hDeviceContext)
1586void s_uCalculateLinkQual(void *hDeviceContext) 1591void s_uCalculateLinkQual(void *hDeviceContext)
1587{ 1592{
1588 PSDevice pDevice = (PSDevice)hDeviceContext; 1593 PSDevice pDevice = (PSDevice)hDeviceContext;
1589 ULONG TxOkRatio, TxCnt; 1594 unsigned long TxOkRatio, TxCnt;
1590 ULONG RxOkRatio,RxCnt; 1595 unsigned long RxOkRatio, RxCnt;
1591 ULONG RssiRatio; 1596 unsigned long RssiRatio;
1592 long ldBm; 1597 long ldBm;
1593 1598
1594TxCnt = pDevice->scStatistic.TxNoRetryOkCount + 1599TxCnt = pDevice->scStatistic.TxNoRetryOkCount +
@@ -1633,7 +1638,7 @@ void BSSvClearAnyBSSJoinRecord(void *hDeviceContext)
1633{ 1638{
1634 PSDevice pDevice = (PSDevice)hDeviceContext; 1639 PSDevice pDevice = (PSDevice)hDeviceContext;
1635 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1640 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1636 UINT ii; 1641 unsigned int ii;
1637 1642
1638 for (ii = 0; ii < MAX_BSS_NUM; ii++) { 1643 for (ii = 0; ii < MAX_BSS_NUM; ii++) {
1639 pMgmt->sBSSList[ii].bSelected = FALSE; 1644 pMgmt->sBSSList[ii].bSelected = FALSE;
diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h
index 0158b0bdf1a0..9686d8600d63 100644
--- a/drivers/staging/vt6656/bssdb.h
+++ b/drivers/staging/vt6656/bssdb.h
@@ -97,10 +97,10 @@ typedef struct tagKnownBSS {
97 // BSS info 97 // BSS info
98 BOOL bActive; 98 BOOL bActive;
99 BYTE abyBSSID[WLAN_BSSID_LEN]; 99 BYTE abyBSSID[WLAN_BSSID_LEN];
100 UINT uChannel; 100 unsigned int uChannel;
101 BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 101 BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
102 BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 102 BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
103 UINT uRSSI; 103 unsigned int uRSSI;
104 BYTE bySQ; 104 BYTE bySQ;
105 WORD wBeaconInterval; 105 WORD wBeaconInterval;
106 WORD wCapInfo; 106 WORD wCapInfo;
@@ -141,9 +141,9 @@ typedef struct tagKnownBSS {
141 WORD wRSNLen; 141 WORD wRSNLen;
142 142
143 // Clear count 143 // Clear count
144 UINT uClearCount; 144 unsigned int uClearCount;
145// BYTE abyIEs[WLAN_BEACON_FR_MAXLEN]; 145// BYTE abyIEs[WLAN_BEACON_FR_MAXLEN];
146 UINT uIELength; 146 unsigned int uIELength;
147 QWORD qwBSSTimestamp; 147 QWORD qwBSSTimestamp;
148 QWORD qwLocalTSF; // local TSF timer 148 QWORD qwLocalTSF; // local TSF timer
149 149
@@ -178,7 +178,7 @@ typedef struct tagKnownNodeDB {
178 BOOL bShortPreamble; 178 BOOL bShortPreamble;
179 BOOL bERPExist; 179 BOOL bERPExist;
180 BOOL bShortSlotTime; 180 BOOL bShortSlotTime;
181 UINT uInActiveCount; 181 unsigned int uInActiveCount;
182 WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. 182 WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp.
183 WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. 183 WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon.
184 WORD wSuppRate; 184 WORD wSuppRate;
@@ -194,35 +194,35 @@ typedef struct tagKnownNodeDB {
194 BOOL bPSEnable; 194 BOOL bPSEnable;
195 BOOL bRxPSPoll; 195 BOOL bRxPSPoll;
196 BYTE byAuthSequence; 196 BYTE byAuthSequence;
197 ULONG ulLastRxJiffer; 197 unsigned long ulLastRxJiffer;
198 BYTE bySuppRate; 198 BYTE bySuppRate;
199 DWORD dwFlags; 199 DWORD dwFlags;
200 WORD wEnQueueCnt; 200 WORD wEnQueueCnt;
201 201
202 BOOL bOnFly; 202 BOOL bOnFly;
203 ULONGLONG KeyRSC; 203 unsigned long long KeyRSC;
204 BYTE byKeyIndex; 204 BYTE byKeyIndex;
205 DWORD dwKeyIndex; 205 DWORD dwKeyIndex;
206 BYTE byCipherSuite; 206 BYTE byCipherSuite;
207 DWORD dwTSC47_16; 207 DWORD dwTSC47_16;
208 WORD wTSC15_0; 208 WORD wTSC15_0;
209 UINT uWepKeyLength; 209 unsigned int uWepKeyLength;
210 BYTE abyWepKey[WLAN_WEPMAX_KEYLEN]; 210 BYTE abyWepKey[WLAN_WEPMAX_KEYLEN];
211 // 211 //
212 // Auto rate fallback vars 212 // Auto rate fallback vars
213 BOOL bIsInFallback; 213 BOOL bIsInFallback;
214 UINT uAverageRSSI; 214 unsigned int uAverageRSSI;
215 UINT uRateRecoveryTimeout; 215 unsigned int uRateRecoveryTimeout;
216 UINT uRatePollTimeout; 216 unsigned int uRatePollTimeout;
217 UINT uTxFailures; 217 unsigned int uTxFailures;
218 UINT uTxAttempts; 218 unsigned int uTxAttempts;
219 219
220 UINT uTxRetry; 220 unsigned int uTxRetry;
221 UINT uFailureRatio; 221 unsigned int uFailureRatio;
222 UINT uRetryRatio; 222 unsigned int uRetryRatio;
223 UINT uTxOk[MAX_RATE+1]; 223 unsigned int uTxOk[MAX_RATE+1];
224 UINT uTxFail[MAX_RATE+1]; 224 unsigned int uTxFail[MAX_RATE+1];
225 UINT uTimeCount; 225 unsigned int uTimeCount;
226 226
227} KnownNodeDB, *PKnownNodeDB; 227} KnownNodeDB, *PKnownNodeDB;
228 228
@@ -253,7 +253,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext,
253 PWLAN_IE_RSN_EXT pRSNWPA, 253 PWLAN_IE_RSN_EXT pRSNWPA,
254 PWLAN_IE_COUNTRY pIE_Country, 254 PWLAN_IE_COUNTRY pIE_Country,
255 PWLAN_IE_QUIET pIE_Quiet, 255 PWLAN_IE_QUIET pIE_Quiet,
256 UINT uIELength, 256 unsigned int uIELength,
257 PBYTE pbyIEs, 257 PBYTE pbyIEs,
258 void *pRxPacketContext); 258 void *pRxPacketContext);
259 259
@@ -272,7 +272,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
272 PWLAN_IE_COUNTRY pIE_Country, 272 PWLAN_IE_COUNTRY pIE_Country,
273 PWLAN_IE_QUIET pIE_Quiet, 273 PWLAN_IE_QUIET pIE_Quiet,
274 PKnownBSS pBSSList, 274 PKnownBSS pBSSList,
275 UINT uIELength, 275 unsigned int uIELength,
276 PBYTE pbyIEs, 276 PBYTE pbyIEs,
277 void *pRxPacketContext); 277 void *pRxPacketContext);
278 278
@@ -295,12 +295,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext,
295 BYTE byPktNO); 295 BYTE byPktNO);
296 296
297void BSSvRemoveOneNode(void *hDeviceContext, 297void BSSvRemoveOneNode(void *hDeviceContext,
298 UINT uNodeIndex); 298 unsigned int uNodeIndex);
299 299
300void BSSvAddMulticastNode(void *hDeviceContext); 300void BSSvAddMulticastNode(void *hDeviceContext);
301 301
302void BSSvClearNodeDBTable(void *hDeviceContext, 302void BSSvClearNodeDBTable(void *hDeviceContext,
303 UINT uStartIndex); 303 unsigned int uStartIndex);
304 304
305void BSSvClearAnyBSSJoinRecord(void *hDeviceContext); 305void BSSvClearAnyBSSJoinRecord(void *hDeviceContext);
306 306
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 6baf8696254b..fe4ec913ffea 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -95,7 +95,7 @@ const WORD cwRXBCNTSFOff[MAX_RATE] =
95 * Return Value: TRUE if succeeded; FALSE if failed. 95 * Return Value: TRUE if succeeded; FALSE if failed.
96 * 96 *
97 */ 97 */
98BOOL CARDbSetMediaChannel(void *pDeviceHandler, UINT uConnectionChannel) 98BOOL CARDbSetMediaChannel(void *pDeviceHandler, unsigned int uConnectionChannel)
99{ 99{
100PSDevice pDevice = (PSDevice) pDeviceHandler; 100PSDevice pDevice = (PSDevice) pDeviceHandler;
101BOOL bResult = TRUE; 101BOOL bResult = TRUE;
@@ -159,7 +159,7 @@ BOOL bResult = TRUE;
159static WORD swGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx) 159static WORD swGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx)
160{ 160{
161 PSDevice pDevice = (PSDevice) pDeviceHandler; 161 PSDevice pDevice = (PSDevice) pDeviceHandler;
162 UINT ui = (UINT)wRateIdx; 162 unsigned int ui = (unsigned int)wRateIdx;
163 while (ui > RATE_1M) { 163 while (ui > RATE_1M) {
164 if (pDevice->wBasicRate & ((WORD)1 << ui)) { 164 if (pDevice->wBasicRate & ((WORD)1 << ui)) {
165 return (WORD)ui; 165 return (WORD)ui;
@@ -185,7 +185,7 @@ static WORD swGetCCKControlRate(void *pDeviceHandler, WORD wRateIdx)
185static WORD swGetOFDMControlRate(void *pDeviceHandler, WORD wRateIdx) 185static WORD swGetOFDMControlRate(void *pDeviceHandler, WORD wRateIdx)
186{ 186{
187 PSDevice pDevice = (PSDevice) pDeviceHandler; 187 PSDevice pDevice = (PSDevice) pDeviceHandler;
188 UINT ui = (UINT)wRateIdx; 188 unsigned int ui = (unsigned int)wRateIdx;
189 189
190 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate); 190 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BASIC RATE: %X\n", pDevice->wBasicRate);
191 191
@@ -508,7 +508,7 @@ void vUpdateIFS(void *pDeviceHandler)
508 else {// PK_TYPE_11GA & PK_TYPE_11GB 508 else {// PK_TYPE_11GA & PK_TYPE_11GB
509 BYTE byRate = 0; 509 BYTE byRate = 0;
510 BOOL bOFDMRate = FALSE; 510 BOOL bOFDMRate = FALSE;
511 UINT ii = 0; 511 unsigned int ii = 0;
512 PWLAN_IE_SUPP_RATES pItemRates = NULL; 512 PWLAN_IE_SUPP_RATES pItemRates = NULL;
513 513
514 pDevice->uSIFS = C_SIFS_BG; 514 pDevice->uSIFS = C_SIFS_BG;
@@ -806,9 +806,9 @@ BOOL CARDbClearCurrentTSF(void *pDeviceHandler)
806QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval) 806QWORD CARDqGetNextTBTT (QWORD qwTSF, WORD wBeaconInterval)
807{ 807{
808 808
809 UINT uLowNextTBTT; 809 unsigned int uLowNextTBTT;
810 UINT uHighRemain, uLowRemain; 810 unsigned int uHighRemain, uLowRemain;
811 UINT uBeaconInterval; 811 unsigned int uBeaconInterval;
812 812
813 uBeaconInterval = wBeaconInterval * 1024; 813 uBeaconInterval = wBeaconInterval * 1024;
814 // Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval 814 // Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 963c8ad3d2ee..6c91343d0d14 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -60,7 +60,8 @@ typedef enum _CARD_OP_MODE {
60 60
61/*--------------------- Export Functions --------------------------*/ 61/*--------------------- Export Functions --------------------------*/
62 62
63BOOL CARDbSetMediaChannel(void *pDeviceHandler, UINT uConnectionChannel); 63BOOL CARDbSetMediaChannel(void *pDeviceHandler,
64 unsigned int uConnectionChannel);
64void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType); 65void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType);
65void vUpdateIFS(void *pDeviceHandler); 66void vUpdateIFS(void *pDeviceHandler);
66void CARDvUpdateBasicTopRate(void *pDeviceHandler); 67void CARDvUpdateBasicTopRate(void *pDeviceHandler);
diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c
index c9b8b19a1f7b..f49b6e133394 100644
--- a/drivers/staging/vt6656/channel.c
+++ b/drivers/staging/vt6656/channel.c
@@ -389,7 +389,7 @@ static struct
389// 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56) 389// 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56)
390 ************************************************************************/ 390 ************************************************************************/
391BOOL 391BOOL
392ChannelValid(UINT CountryCode, UINT ChannelIndex) 392ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
393{ 393{
394 BOOL bValid; 394 BOOL bValid;
395 395
@@ -425,7 +425,7 @@ exit:
425 ************************************************************************/ 425 ************************************************************************/
426BOOL 426BOOL
427CHvChannelGetList ( 427CHvChannelGetList (
428 UINT uCountryCodeIdx, 428 unsigned int uCountryCodeIdx,
429 PBYTE pbyChannelTable 429 PBYTE pbyChannelTable
430 ) 430 )
431{ 431{
@@ -441,7 +441,7 @@ void CHvInitChannelTable(void *pDeviceHandler)
441{ 441{
442 PSDevice pDevice = (PSDevice) pDeviceHandler; 442 PSDevice pDevice = (PSDevice) pDeviceHandler;
443 BOOL bMultiBand = FALSE; 443 BOOL bMultiBand = FALSE;
444 UINT ii; 444 unsigned int ii;
445 445
446 for(ii=1;ii<=CB_MAX_CHANNEL;ii++) { 446 for(ii=1;ii<=CB_MAX_CHANNEL;ii++) {
447 sChannelTbl[ii].bValid = FALSE; 447 sChannelTbl[ii].bValid = FALSE;
diff --git a/drivers/staging/vt6656/channel.h b/drivers/staging/vt6656/channel.h
index 26d12a0c6db8..91c2ffc6f1f0 100644
--- a/drivers/staging/vt6656/channel.h
+++ b/drivers/staging/vt6656/channel.h
@@ -37,20 +37,20 @@
37/*--------------------- Export Classes ----------------------------*/ 37/*--------------------- Export Classes ----------------------------*/
38typedef struct tagSChannelTblElement { 38typedef struct tagSChannelTblElement {
39 BYTE byChannelNumber; 39 BYTE byChannelNumber;
40 UINT uFrequency; 40 unsigned int uFrequency;
41 BOOL bValid; 41 BOOL bValid;
42}SChannelTblElement, *PSChannelTblElement; 42}SChannelTblElement, *PSChannelTblElement;
43 43
44/*--------------------- Export Variables --------------------------*/ 44/*--------------------- Export Variables --------------------------*/
45 45
46/*--------------------- Export Functions --------------------------*/ 46/*--------------------- Export Functions --------------------------*/
47BOOL ChannelValid(UINT CountryCode, UINT ChannelNum); 47BOOL ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);
48void CHvInitChannelTable(void *pDeviceHandler); 48void CHvInitChannelTable(void *pDeviceHandler);
49BYTE CHbyGetChannelMapping(BYTE byChannelNumber); 49BYTE CHbyGetChannelMapping(BYTE byChannelNumber);
50 50
51BOOL 51BOOL
52CHvChannelGetList ( 52CHvChannelGetList (
53 UINT uCountryCodeIdx, 53 unsigned int uCountryCodeIdx,
54 PBYTE pbyChannelTable 54 PBYTE pbyChannelTable
55 ); 55 );
56 56
diff --git a/drivers/staging/vt6656/datarate.c b/drivers/staging/vt6656/datarate.c
index 4d2880b8d839..2e183ddbfd0e 100644
--- a/drivers/staging/vt6656/datarate.c
+++ b/drivers/staging/vt6656/datarate.c
@@ -201,11 +201,11 @@ void RATEvParseMaxRate(
201 ) 201 )
202{ 202{
203PSDevice pDevice = (PSDevice) pDeviceHandler; 203PSDevice pDevice = (PSDevice) pDeviceHandler;
204UINT ii; 204unsigned int ii;
205BYTE byHighSuppRate = 0; 205BYTE byHighSuppRate = 0;
206BYTE byRate = 0; 206BYTE byRate = 0;
207WORD wOldBasicRate = pDevice->wBasicRate; 207WORD wOldBasicRate = pDevice->wBasicRate;
208UINT uRateLen; 208unsigned int uRateLen;
209 209
210 210
211 if (pItemRates == NULL) 211 if (pItemRates == NULL)
@@ -241,7 +241,7 @@ UINT uRateLen;
241 if ((pItemExtRates != NULL) && (pItemExtRates->byElementID == WLAN_EID_EXTSUPP_RATES) && 241 if ((pItemExtRates != NULL) && (pItemExtRates->byElementID == WLAN_EID_EXTSUPP_RATES) &&
242 (pDevice->byBBType != BB_TYPE_11B)) { 242 (pDevice->byBBType != BB_TYPE_11B)) {
243 243
244 UINT uExtRateLen = pItemExtRates->len; 244 unsigned int uExtRateLen = pItemExtRates->len;
245 245
246 if (uExtRateLen > WLAN_RATES_MAXLEN) 246 if (uExtRateLen > WLAN_RATES_MAXLEN)
247 uExtRateLen = WLAN_RATES_MAXLEN; 247 uExtRateLen = WLAN_RATES_MAXLEN;
@@ -311,7 +311,7 @@ PSDevice pDevice = (PSDevice) pDeviceHandler;
311PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 311PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
312#if 1 //mike fixed old: use packet lose ratio algorithm to control rate 312#if 1 //mike fixed old: use packet lose ratio algorithm to control rate
313WORD wIdxDownRate = 0; 313WORD wIdxDownRate = 0;
314UINT ii; 314unsigned int ii;
315BOOL bAutoRate[MAX_RATE] = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE}; 315BOOL bAutoRate[MAX_RATE] = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};
316DWORD dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540}; 316DWORD dwThroughputTbl[MAX_RATE] = {10, 20, 55, 110, 60, 90, 120, 180, 240, 360, 480, 540};
317DWORD dwThroughput = 0; 317DWORD dwThroughput = 0;
@@ -392,7 +392,7 @@ DWORD dwTxDiff = 0;
392#else //mike fixed new: use differ-signal strength to control rate 392#else //mike fixed new: use differ-signal strength to control rate
393WORD wIdxUpRate = 0; 393WORD wIdxUpRate = 0;
394BOOL bAutoRate[MAX_RATE] = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE}; 394BOOL bAutoRate[MAX_RATE] = {TRUE,TRUE,TRUE,TRUE,FALSE,FALSE,TRUE,TRUE,TRUE,TRUE,TRUE,TRUE};
395UINT ii; 395unsigned int ii;
396long ldBm; 396long ldBm;
397 397
398 if (pMgmt->eScanState != WMAC_NO_SCANNING) { 398 if (pMgmt->eScanState != WMAC_NO_SCANNING) {
@@ -468,10 +468,10 @@ BYTE
468RATEuSetIE ( 468RATEuSetIE (
469 PWLAN_IE_SUPP_RATES pSrcRates, 469 PWLAN_IE_SUPP_RATES pSrcRates,
470 PWLAN_IE_SUPP_RATES pDstRates, 470 PWLAN_IE_SUPP_RATES pDstRates,
471 UINT uRateLen 471 unsigned int uRateLen
472 ) 472 )
473{ 473{
474 UINT ii, uu, uRateCnt = 0; 474 unsigned int ii, uu, uRateCnt = 0;
475 475
476 if ((pSrcRates == NULL) || (pDstRates == NULL)) 476 if ((pSrcRates == NULL) || (pDstRates == NULL))
477 return 0; 477 return 0;
diff --git a/drivers/staging/vt6656/datarate.h b/drivers/staging/vt6656/datarate.h
index 7d73a3a53bea..c6f5163ff9b8 100644
--- a/drivers/staging/vt6656/datarate.h
+++ b/drivers/staging/vt6656/datarate.h
@@ -92,7 +92,7 @@ BYTE
92RATEuSetIE( 92RATEuSetIE(
93 PWLAN_IE_SUPP_RATES pSrcRates, 93 PWLAN_IE_SUPP_RATES pSrcRates,
94 PWLAN_IE_SUPP_RATES pDstRates, 94 PWLAN_IE_SUPP_RATES pDstRates,
95 UINT uRateLen 95 unsigned int uRateLen
96 ); 96 );
97 97
98WORD 98WORD
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index eb45ee597644..ef9fd97d3ca7 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -225,12 +225,12 @@ typedef struct _USB_SEND_CONTEXT {
225 void *pDevice; 225 void *pDevice;
226 struct sk_buff *pPacket; 226 struct sk_buff *pPacket;
227 struct urb *pUrb; 227 struct urb *pUrb;
228 UINT uBufLen; 228 unsigned int uBufLen;
229 CONTEXT_TYPE Type; 229 CONTEXT_TYPE Type;
230 SEthernetHeader sEthHeader; 230 SEthernetHeader sEthHeader;
231 void *Next; 231 void *Next;
232 BOOL bBoolInUse; 232 BOOL bBoolInUse;
233 UCHAR Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS]; 233 unsigned char Data[MAX_TOTAL_SIZE_WITH_ALL_HEADERS];
234} USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT; 234} USB_SEND_CONTEXT, *PUSB_SEND_CONTEXT;
235 235
236 236
@@ -248,7 +248,7 @@ typedef struct _DEFAULT_CONFIG {
248// Structure to keep track of usb interrupt packets 248// Structure to keep track of usb interrupt packets
249// 249//
250typedef struct { 250typedef struct {
251 UINT uDataLen; 251 unsigned int uDataLen;
252 PBYTE pDataBuf; 252 PBYTE pDataBuf;
253// struct urb *pUrb; 253// struct urb *pUrb;
254 BOOL bInUse; 254 BOOL bInUse;
@@ -295,7 +295,7 @@ typedef enum __DEVICE_NDIS_STATUS {
295#define NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED 0x01 295#define NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED 0x01
296 296
297// PMKID Structures 297// PMKID Structures
298typedef UCHAR NDIS_802_11_PMKID_VALUE[16]; 298typedef unsigned char NDIS_802_11_PMKID_VALUE[16];
299 299
300 300
301typedef enum _NDIS_802_11_WEP_STATUS 301typedef enum _NDIS_802_11_WEP_STATUS
@@ -327,7 +327,7 @@ typedef enum _NDIS_802_11_STATUS_TYPE
327//Added new types for PMKID Candidate lists. 327//Added new types for PMKID Candidate lists.
328typedef struct _PMKID_CANDIDATE { 328typedef struct _PMKID_CANDIDATE {
329 NDIS_802_11_MAC_ADDRESS BSSID; 329 NDIS_802_11_MAC_ADDRESS BSSID;
330 ULONG Flags; 330 unsigned long Flags;
331} PMKID_CANDIDATE, *PPMKID_CANDIDATE; 331} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
332 332
333 333
@@ -338,15 +338,15 @@ typedef struct _BSSID_INFO
338} BSSID_INFO, *PBSSID_INFO; 338} BSSID_INFO, *PBSSID_INFO;
339 339
340typedef struct tagSPMKID { 340typedef struct tagSPMKID {
341 ULONG Length; 341 unsigned long Length;
342 ULONG BSSIDInfoCount; 342 unsigned long BSSIDInfoCount;
343 BSSID_INFO BSSIDInfo[MAX_BSSIDINFO_4_PMKID]; 343 BSSID_INFO BSSIDInfo[MAX_BSSIDINFO_4_PMKID];
344} SPMKID, *PSPMKID; 344} SPMKID, *PSPMKID;
345 345
346typedef struct tagSPMKIDCandidateEvent { 346typedef struct tagSPMKIDCandidateEvent {
347 NDIS_802_11_STATUS_TYPE StatusType; 347 NDIS_802_11_STATUS_TYPE StatusType;
348 ULONG Version; // Version of the structure 348 unsigned long Version; /* Version of the structure */
349 ULONG NumCandidates; // No. of pmkid candidates 349 unsigned long NumCandidates; /* No. of pmkid candidates */
350 PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST]; 350 PMKID_CANDIDATE CandidateList[MAX_PMKIDLIST];
351} SPMKIDCandidateEvent, *PSPMKIDCandidateEvent; 351} SPMKIDCandidateEvent, *PSPMKIDCandidateEvent;
352 352
@@ -376,7 +376,7 @@ typedef struct tagSCache{
376/* The receive cache is updated circularly. The next entry to be written is 376/* The receive cache is updated circularly. The next entry to be written is
377 * indexed by the "InPtr". 377 * indexed by the "InPtr".
378*/ 378*/
379 UINT uInPtr; // Place to use next 379 unsigned int uInPtr; /* Place to use next */
380 SCacheEntry asCacheEntry[DUPLICATE_RX_CACHE_LENGTH]; 380 SCacheEntry asCacheEntry[DUPLICATE_RX_CACHE_LENGTH];
381} SCache, *PSCache; 381} SCache, *PSCache;
382 382
@@ -387,10 +387,10 @@ typedef struct tagSDeFragControlBlock
387 WORD wSequence; 387 WORD wSequence;
388 WORD wFragNum; 388 WORD wFragNum;
389 BYTE abyAddr2[ETH_ALEN]; 389 BYTE abyAddr2[ETH_ALEN];
390 UINT uLifetime; 390 unsigned int uLifetime;
391 struct sk_buff* skb; 391 struct sk_buff* skb;
392 PBYTE pbyRxBuffer; 392 PBYTE pbyRxBuffer;
393 UINT cbFrameLength; 393 unsigned int cbFrameLength;
394 BOOL bInUse; 394 BOOL bInUse;
395} SDeFragControlBlock, *PSDeFragControlBlock; 395} SDeFragControlBlock, *PSDeFragControlBlock;
396 396
@@ -463,14 +463,14 @@ typedef struct __device_info {
463 BYTE byRevId; 463 BYTE byRevId;
464 464
465 u32 flags; 465 u32 flags;
466 ULONG Flags; 466 unsigned long Flags;
467 467
468 SCache sDupRxCache; 468 SCache sDupRxCache;
469 469
470 SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG]; 470 SDeFragControlBlock sRxDFCB[CB_MAX_RX_FRAG];
471 UINT cbDFCB; 471 unsigned int cbDFCB;
472 UINT cbFreeDFCB; 472 unsigned int cbFreeDFCB;
473 UINT uCurrentDFCBIdx; 473 unsigned int uCurrentDFCBIdx;
474 474
475 // +++USB 475 // +++USB
476 476
@@ -478,29 +478,29 @@ typedef struct __device_info {
478 struct urb *pInterruptURB; 478 struct urb *pInterruptURB;
479 struct usb_ctrlrequest sUsbCtlRequest; 479 struct usb_ctrlrequest sUsbCtlRequest;
480 480
481 UINT int_interval; 481 unsigned int int_interval;
482 // 482 //
483 // Variables to track resources for the BULK In Pipe 483 // Variables to track resources for the BULK In Pipe
484 // 484 //
485 PRCB pRCBMem; 485 PRCB pRCBMem;
486 PRCB apRCB[CB_MAX_RX_DESC]; 486 PRCB apRCB[CB_MAX_RX_DESC];
487 UINT cbRD; 487 unsigned int cbRD;
488 PRCB FirstRecvFreeList; 488 PRCB FirstRecvFreeList;
489 PRCB LastRecvFreeList; 489 PRCB LastRecvFreeList;
490 UINT NumRecvFreeList; 490 unsigned int NumRecvFreeList;
491 PRCB FirstRecvMngList; 491 PRCB FirstRecvMngList;
492 PRCB LastRecvMngList; 492 PRCB LastRecvMngList;
493 UINT NumRecvMngList; 493 unsigned int NumRecvMngList;
494 BOOL bIsRxWorkItemQueued; 494 BOOL bIsRxWorkItemQueued;
495 BOOL bIsRxMngWorkItemQueued; 495 BOOL bIsRxMngWorkItemQueued;
496 ULONG ulRcvRefCount; // number of packets that have not been returned back 496 unsigned long ulRcvRefCount; /* packets that have not returned back */
497 497
498 // 498 //
499 // Variables to track resources for the BULK Out Pipe 499 // Variables to track resources for the BULK Out Pipe
500 // 500 //
501 501
502 PUSB_SEND_CONTEXT apTD[CB_MAX_TX_DESC]; 502 PUSB_SEND_CONTEXT apTD[CB_MAX_TX_DESC];
503 UINT cbTD; 503 unsigned int cbTD;
504 504
505 // 505 //
506 // Variables to track resources for the Interript In Pipe 506 // Variables to track resources for the Interript In Pipe
@@ -517,20 +517,20 @@ typedef struct __device_info {
517 // 517 //
518 // Statistic for USB 518 // Statistic for USB
519 // protect with spinlock 519 // protect with spinlock
520 ULONG ulBulkInPosted; 520 unsigned long ulBulkInPosted;
521 ULONG ulBulkInError; 521 unsigned long ulBulkInError;
522 ULONG ulBulkInContCRCError; 522 unsigned long ulBulkInContCRCError;
523 ULONG ulBulkInBytesRead; 523 unsigned long ulBulkInBytesRead;
524 524
525 ULONG ulBulkOutPosted; 525 unsigned long ulBulkOutPosted;
526 ULONG ulBulkOutError; 526 unsigned long ulBulkOutError;
527 ULONG ulBulkOutContCRCError; 527 unsigned long ulBulkOutContCRCError;
528 ULONG ulBulkOutBytesWrite; 528 unsigned long ulBulkOutBytesWrite;
529 529
530 ULONG ulIntInPosted; 530 unsigned long ulIntInPosted;
531 ULONG ulIntInError; 531 unsigned long ulIntInError;
532 ULONG ulIntInContCRCError; 532 unsigned long ulIntInContCRCError;
533 ULONG ulIntInBytesRead; 533 unsigned long ulIntInBytesRead;
534 534
535 535
536 // Version control 536 // Version control
@@ -560,24 +560,24 @@ typedef struct __device_info {
560 // 560 //
561 // Maintain statistical debug info. 561 // Maintain statistical debug info.
562 // 562 //
563 ULONG packetsReceived; 563 unsigned long packetsReceived;
564 ULONG packetsReceivedDropped; 564 unsigned long packetsReceivedDropped;
565 ULONG packetsReceivedOverflow; 565 unsigned long packetsReceivedOverflow;
566 ULONG packetsSent; 566 unsigned long packetsSent;
567 ULONG packetsSentDropped; 567 unsigned long packetsSentDropped;
568 ULONG SendContextsInUse; 568 unsigned long SendContextsInUse;
569 ULONG RcvBuffersInUse; 569 unsigned long RcvBuffersInUse;
570 570
571 571
572 // 802.11 management 572 // 802.11 management
573 SMgmtObject sMgmtObj; 573 SMgmtObject sMgmtObj;
574 574
575 QWORD qwCurrTSF; 575 QWORD qwCurrTSF;
576 UINT cbBulkInMax; 576 unsigned int cbBulkInMax;
577 BOOL bPSRxBeacon; 577 BOOL bPSRxBeacon;
578 578
579 // 802.11 MAC specific 579 // 802.11 MAC specific
580 UINT uCurrRSSI; 580 unsigned int uCurrRSSI;
581 BYTE byCurrSQ; 581 BYTE byCurrSQ;
582 582
583 583
@@ -598,30 +598,31 @@ typedef struct __device_info {
598 598
599 BOOL bDiversityRegCtlON; 599 BOOL bDiversityRegCtlON;
600 BOOL bDiversityEnable; 600 BOOL bDiversityEnable;
601 ULONG ulDiversityNValue; 601 unsigned long ulDiversityNValue;
602 ULONG ulDiversityMValue; 602 unsigned long ulDiversityMValue;
603 BYTE byTMax; 603 BYTE byTMax;
604 BYTE byTMax2; 604 BYTE byTMax2;
605 BYTE byTMax3; 605 BYTE byTMax3;
606 ULONG ulSQ3TH; 606 unsigned long ulSQ3TH;
607 607
608 ULONG uDiversityCnt; 608 unsigned long uDiversityCnt;
609 BYTE byAntennaState; 609 BYTE byAntennaState;
610 ULONG ulRatio_State0; 610 unsigned long ulRatio_State0;
611 ULONG ulRatio_State1; 611 unsigned long ulRatio_State1;
612 ULONG ulSQ3_State0; 612 unsigned long ulSQ3_State0;
613 ULONG ulSQ3_State1; 613 unsigned long ulSQ3_State1;
614 614
615 ULONG aulSQ3Val[MAX_RATE]; 615 unsigned long aulSQ3Val[MAX_RATE];
616 ULONG aulPktNum[MAX_RATE]; 616 unsigned long aulPktNum[MAX_RATE];
617 617
618 // IFS & Cw 618 /* IFS & Cw */
619 UINT uSIFS; //Current SIFS 619 unsigned int uSIFS; /* Current SIFS */
620 UINT uDIFS; //Current DIFS 620 unsigned int uDIFS; /* Current DIFS */
621 UINT uEIFS; //Current EIFS 621 unsigned int uEIFS; /* Current EIFS */
622 UINT uSlot; //Current SlotTime 622 unsigned int uSlot; /* Current SlotTime */
623 UINT uCwMin; //Current CwMin 623 unsigned int uCwMin; /* Current CwMin */
624 UINT uCwMax; //CwMax is fixed on 1023. 624 unsigned int uCwMax; /* CwMax is fixed on 1023 */
625
625 // PHY parameter 626 // PHY parameter
626 BYTE bySIFS; 627 BYTE bySIFS;
627 BYTE byDIFS; 628 BYTE byDIFS;
@@ -646,7 +647,7 @@ typedef struct __device_info {
646 647
647 BYTE byMinChannel; 648 BYTE byMinChannel;
648 BYTE byMaxChannel; 649 BYTE byMaxChannel;
649 UINT uConnectionRate; 650 unsigned int uConnectionRate;
650 651
651 BYTE byPreambleType; 652 BYTE byPreambleType;
652 BYTE byShortPreamble; 653 BYTE byShortPreamble;
@@ -700,7 +701,7 @@ typedef struct __device_info {
700 WORD wListenInterval; 701 WORD wListenInterval;
701 BOOL bPWBitOn; 702 BOOL bPWBitOn;
702 WMAC_POWER_MODE ePSMode; 703 WMAC_POWER_MODE ePSMode;
703 ULONG ulPSModeWaitTx; 704 unsigned long ulPSModeWaitTx;
704 BOOL bPSModeTxBurst; 705 BOOL bPSModeTxBurst;
705 706
706 // Beacon releated 707 // Beacon releated
@@ -709,7 +710,7 @@ typedef struct __device_info {
709 BOOL bBeaconSent; 710 BOOL bBeaconSent;
710 BOOL bFixRate; 711 BOOL bFixRate;
711 BYTE byCurrentCh; 712 BYTE byCurrentCh;
712 UINT uScanTime; 713 unsigned int uScanTime;
713 714
714 CMD_STATE eCommandState; 715 CMD_STATE eCommandState;
715 716
@@ -720,15 +721,15 @@ typedef struct __device_info {
720 BOOL bStopBeacon; 721 BOOL bStopBeacon;
721 BOOL bStopDataPkt; 722 BOOL bStopDataPkt;
722 BOOL bStopTx0Pkt; 723 BOOL bStopTx0Pkt;
723 UINT uAutoReConnectTime; 724 unsigned int uAutoReConnectTime;
724 UINT uIsroamingTime; 725 unsigned int uIsroamingTime;
725 726
726 // 802.11 counter 727 // 802.11 counter
727 728
728 CMD_ITEM eCmdQueue[CMD_Q_SIZE]; 729 CMD_ITEM eCmdQueue[CMD_Q_SIZE];
729 UINT uCmdDequeueIdx; 730 unsigned int uCmdDequeueIdx;
730 UINT uCmdEnqueueIdx; 731 unsigned int uCmdEnqueueIdx;
731 UINT cbFreeCmdQueue; 732 unsigned int cbFreeCmdQueue;
732 BOOL bCmdRunning; 733 BOOL bCmdRunning;
733 BOOL bCmdClear; 734 BOOL bCmdClear;
734 BOOL bNeedRadioOFF; 735 BOOL bNeedRadioOFF;
@@ -740,7 +741,7 @@ typedef struct __device_info {
740 BYTE bSameBSSCurNum; //DavidWang 741 BYTE bSameBSSCurNum; //DavidWang
741 BOOL bRoaming; 742 BOOL bRoaming;
742 BOOL b11hEable; 743 BOOL b11hEable;
743 ULONG ulTxPower; 744 unsigned long ulTxPower;
744 745
745 // Encryption 746 // Encryption
746 NDIS_802_11_WEP_STATUS eEncryptionStatus; 747 NDIS_802_11_WEP_STATUS eEncryptionStatus;
@@ -761,11 +762,11 @@ typedef struct __device_info {
761 BOOL bAES; 762 BOOL bAES;
762 BYTE byCntMeasure; 763 BYTE byCntMeasure;
763 764
764 UINT uKeyLength; 765 unsigned int uKeyLength;
765 BYTE abyKey[WLAN_WEP232_KEYLEN]; 766 BYTE abyKey[WLAN_WEP232_KEYLEN];
766 767
767 // for AP mode 768 // for AP mode
768 UINT uAssocCount; 769 unsigned int uAssocCount;
769 BOOL bMoreData; 770 BOOL bMoreData;
770 771
771 // QoS 772 // QoS
@@ -780,7 +781,7 @@ typedef struct __device_info {
780 781
781 // For Update BaseBand VGA Gain Offset 782 // For Update BaseBand VGA Gain Offset
782 BOOL bUpdateBBVGA; 783 BOOL bUpdateBBVGA;
783 UINT uBBVGADiffCount; 784 unsigned int uBBVGADiffCount;
784 BYTE byBBVGANew; 785 BYTE byBBVGANew;
785 BYTE byBBVGACurrent; 786 BYTE byBBVGACurrent;
786 BYTE abyBBVGA[BB_VGA_LEVEL]; 787 BYTE abyBBVGA[BB_VGA_LEVEL];
@@ -812,7 +813,7 @@ typedef struct __device_info {
812//2007-0115-01<Add>by MikeLiu 813//2007-0115-01<Add>by MikeLiu
813#ifdef TxInSleep 814#ifdef TxInSleep
814 struct timer_list sTimerTxData; 815 struct timer_list sTimerTxData;
815 ULONG nTxDataTimeCout; 816 unsigned long nTxDataTimeCout;
816 BOOL fTxDataInSleep; 817 BOOL fTxDataInSleep;
817 BOOL IsTxDataTrigger; 818 BOOL IsTxDataTrigger;
818#endif 819#endif
@@ -863,7 +864,7 @@ typedef struct __device_info {
863 struct net_device *apdev; 864 struct net_device *apdev;
864 int (*tx_80211)(struct sk_buff *skb, struct net_device *dev); 865 int (*tx_80211)(struct sk_buff *skb, struct net_device *dev);
865#endif 866#endif
866 UINT uChannel; 867 unsigned int uChannel;
867 868
868 struct iw_statistics wstats; // wireless stats 869 struct iw_statistics wstats; // wireless stats
869 BOOL bCommit; 870 BOOL bCommit;
@@ -928,7 +929,9 @@ typedef struct __device_info {
928 929
929/*--------------------- Export Functions --------------------------*/ 930/*--------------------- Export Functions --------------------------*/
930 931
931//BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb, UINT uNodeIndex); 932/* BOOL device_dma0_xmit(PSDevice pDevice, struct sk_buff *skb,
933 * unsigned int uNodeIndex);
934 */
932BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); 935BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF);
933 936
934#endif 937#endif
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index d9a02ba40d84..9afe76cacef5 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -89,7 +89,7 @@ void
89s_vProcessRxMACHeader ( 89s_vProcessRxMACHeader (
90 PSDevice pDevice, 90 PSDevice pDevice,
91 PBYTE pbyRxBufferAddr, 91 PBYTE pbyRxBufferAddr,
92 UINT cbPacketSize, 92 unsigned int cbPacketSize,
93 BOOL bIsWEP, 93 BOOL bIsWEP,
94 BOOL bExtIV, 94 BOOL bExtIV,
95 PUINT pcbHeadSize 95 PUINT pcbHeadSize
@@ -106,8 +106,8 @@ static BOOL s_bAPModeRxCtl(
106static BOOL s_bAPModeRxData ( 106static BOOL s_bAPModeRxData (
107 PSDevice pDevice, 107 PSDevice pDevice,
108 struct sk_buff *skb, 108 struct sk_buff *skb,
109 UINT FrameSize, 109 unsigned int FrameSize,
110 UINT cbHeaderOffset, 110 unsigned int cbHeaderOffset,
111 signed int iSANodeIndex, 111 signed int iSANodeIndex,
112 signed int iDANodeIndex 112 signed int iDANodeIndex
113 ); 113 );
@@ -116,7 +116,7 @@ static BOOL s_bAPModeRxData (
116static BOOL s_bHandleRxEncryption( 116static BOOL s_bHandleRxEncryption(
117 PSDevice pDevice, 117 PSDevice pDevice,
118 PBYTE pbyFrame, 118 PBYTE pbyFrame,
119 UINT FrameSize, 119 unsigned int FrameSize,
120 PBYTE pbyRsr, 120 PBYTE pbyRsr,
121 PBYTE pbyNewRsr, 121 PBYTE pbyNewRsr,
122 PSKeyItem * pKeyOut, 122 PSKeyItem * pKeyOut,
@@ -129,7 +129,7 @@ static BOOL s_bHostWepRxEncryption(
129 129
130 PSDevice pDevice, 130 PSDevice pDevice,
131 PBYTE pbyFrame, 131 PBYTE pbyFrame,
132 UINT FrameSize, 132 unsigned int FrameSize,
133 PBYTE pbyRsr, 133 PBYTE pbyRsr,
134 BOOL bOnFly, 134 BOOL bOnFly,
135 PSKeyItem pKey, 135 PSKeyItem pKey,
@@ -164,14 +164,14 @@ void
164s_vProcessRxMACHeader ( 164s_vProcessRxMACHeader (
165 PSDevice pDevice, 165 PSDevice pDevice,
166 PBYTE pbyRxBufferAddr, 166 PBYTE pbyRxBufferAddr,
167 UINT cbPacketSize, 167 unsigned int cbPacketSize,
168 BOOL bIsWEP, 168 BOOL bIsWEP,
169 BOOL bExtIV, 169 BOOL bExtIV,
170 PUINT pcbHeadSize 170 PUINT pcbHeadSize
171 ) 171 )
172{ 172{
173 PBYTE pbyRxBuffer; 173 PBYTE pbyRxBuffer;
174 UINT cbHeaderSize = 0; 174 unsigned int cbHeaderSize = 0;
175 PWORD pwType; 175 PWORD pwType;
176 PS802_11Header pMACHeader; 176 PS802_11Header pMACHeader;
177 int ii; 177 int ii;
@@ -266,7 +266,7 @@ s_vGetDASA (
266 PSEthernetHeader psEthHeader 266 PSEthernetHeader psEthHeader
267 ) 267 )
268{ 268{
269 UINT cbHeaderSize = 0; 269 unsigned int cbHeaderSize = 0;
270 PS802_11Header pMACHeader; 270 PS802_11Header pMACHeader;
271 int ii; 271 int ii;
272 272
@@ -318,7 +318,7 @@ BOOL
318RXbBulkInProcessData ( 318RXbBulkInProcessData (
319 PSDevice pDevice, 319 PSDevice pDevice,
320 PRCB pRCB, 320 PRCB pRCB,
321 ULONG BytesToIndicate 321 unsigned long BytesToIndicate
322 ) 322 )
323{ 323{
324 324
@@ -333,20 +333,20 @@ RXbBulkInProcessData (
333 PQWORD pqwTSFTime; 333 PQWORD pqwTSFTime;
334 PBYTE pbyFrame; 334 PBYTE pbyFrame;
335 BOOL bDeFragRx = FALSE; 335 BOOL bDeFragRx = FALSE;
336 UINT cbHeaderOffset; 336 unsigned int cbHeaderOffset;
337 UINT FrameSize; 337 unsigned int FrameSize;
338 WORD wEtherType = 0; 338 WORD wEtherType = 0;
339 signed int iSANodeIndex = -1; 339 signed int iSANodeIndex = -1;
340 signed int iDANodeIndex = -1; 340 signed int iDANodeIndex = -1;
341 UINT ii; 341 unsigned int ii;
342 UINT cbIVOffset; 342 unsigned int cbIVOffset;
343 PBYTE pbyRxSts; 343 PBYTE pbyRxSts;
344 PBYTE pbyRxRate; 344 PBYTE pbyRxRate;
345 PBYTE pbySQ; 345 PBYTE pbySQ;
346#ifdef Calcu_LinkQual 346#ifdef Calcu_LinkQual
347 PBYTE pby3SQ; 347 PBYTE pby3SQ;
348#endif 348#endif
349 UINT cbHeaderSize; 349 unsigned int cbHeaderSize;
350 PSKeyItem pKey = NULL; 350 PSKeyItem pKey = NULL;
351 WORD wRxTSC15_0 = 0; 351 WORD wRxTSC15_0 = 0;
352 DWORD dwRxTSC47_16 = 0; 352 DWORD dwRxTSC47_16 = 0;
@@ -372,7 +372,7 @@ RXbBulkInProcessData (
372 372
373 //[31:16]RcvByteCount ( not include 4-byte Status ) 373 //[31:16]RcvByteCount ( not include 4-byte Status )
374 dwWbkStatus = *( (PDWORD)(skb->data) ); 374 dwWbkStatus = *( (PDWORD)(skb->data) );
375 FrameSize = (UINT)(dwWbkStatus >> 16); 375 FrameSize = (unsigned int)(dwWbkStatus >> 16);
376 FrameSize += 4; 376 FrameSize += 4;
377 377
378 if (BytesToIndicate != FrameSize) { 378 if (BytesToIndicate != FrameSize) {
@@ -934,9 +934,9 @@ RXbBulkInProcessData (
934 if (bIsWEP) { 934 if (bIsWEP) {
935 WORD wLocalTSC15_0 = 0; 935 WORD wLocalTSC15_0 = 0;
936 DWORD dwLocalTSC47_16 = 0; 936 DWORD dwLocalTSC47_16 = 0;
937 ULONGLONG RSC = 0; 937 unsigned long long RSC = 0;
938 // endian issues 938 // endian issues
939 RSC = *((ULONGLONG *) &(pKey->KeyRSC)); 939 RSC = *((unsigned long long *) &(pKey->KeyRSC));
940 wLocalTSC15_0 = (WORD) RSC; 940 wLocalTSC15_0 = (WORD) RSC;
941 dwLocalTSC47_16 = (DWORD) (RSC>>16); 941 dwLocalTSC47_16 = (DWORD) (RSC>>16);
942 942
@@ -1151,7 +1151,7 @@ static BOOL s_bAPModeRxCtl (
1151static BOOL s_bHandleRxEncryption ( 1151static BOOL s_bHandleRxEncryption (
1152 PSDevice pDevice, 1152 PSDevice pDevice,
1153 PBYTE pbyFrame, 1153 PBYTE pbyFrame,
1154 UINT FrameSize, 1154 unsigned int FrameSize,
1155 PBYTE pbyRsr, 1155 PBYTE pbyRsr,
1156 PBYTE pbyNewRsr, 1156 PBYTE pbyNewRsr,
1157 PSKeyItem * pKeyOut, 1157 PSKeyItem * pKeyOut,
@@ -1160,7 +1160,7 @@ static BOOL s_bHandleRxEncryption (
1160 PDWORD pdwRxTSC47_16 1160 PDWORD pdwRxTSC47_16
1161 ) 1161 )
1162{ 1162{
1163 UINT PayloadLen = FrameSize; 1163 unsigned int PayloadLen = FrameSize;
1164 PBYTE pbyIV; 1164 PBYTE pbyIV;
1165 BYTE byKeyIdx; 1165 BYTE byKeyIdx;
1166 PSKeyItem pKey = NULL; 1166 PSKeyItem pKey = NULL;
@@ -1297,7 +1297,7 @@ static BOOL s_bHandleRxEncryption (
1297static BOOL s_bHostWepRxEncryption ( 1297static BOOL s_bHostWepRxEncryption (
1298 PSDevice pDevice, 1298 PSDevice pDevice,
1299 PBYTE pbyFrame, 1299 PBYTE pbyFrame,
1300 UINT FrameSize, 1300 unsigned int FrameSize,
1301 PBYTE pbyRsr, 1301 PBYTE pbyRsr,
1302 BOOL bOnFly, 1302 BOOL bOnFly,
1303 PSKeyItem pKey, 1303 PSKeyItem pKey,
@@ -1308,7 +1308,7 @@ static BOOL s_bHostWepRxEncryption (
1308 ) 1308 )
1309{ 1309{
1310 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1310 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1311 UINT PayloadLen = FrameSize; 1311 unsigned int PayloadLen = FrameSize;
1312 PBYTE pbyIV; 1312 PBYTE pbyIV;
1313 BYTE byKeyIdx; 1313 BYTE byKeyIdx;
1314 BYTE byDecMode = KEY_CTL_WEP; 1314 BYTE byDecMode = KEY_CTL_WEP;
@@ -1429,8 +1429,8 @@ static BOOL s_bHostWepRxEncryption (
1429static BOOL s_bAPModeRxData ( 1429static BOOL s_bAPModeRxData (
1430 PSDevice pDevice, 1430 PSDevice pDevice,
1431 struct sk_buff *skb, 1431 struct sk_buff *skb,
1432 UINT FrameSize, 1432 unsigned int FrameSize,
1433 UINT cbHeaderOffset, 1433 unsigned int cbHeaderOffset,
1434 signed int iSANodeIndex, 1434 signed int iSANodeIndex,
1435 signed int iDANodeIndex 1435 signed int iDANodeIndex
1436 ) 1436 )
@@ -1503,7 +1503,8 @@ static BOOL s_bAPModeRxData (
1503 iDANodeIndex = 0; 1503 iDANodeIndex = 0;
1504 1504
1505 if ((pDevice->uAssocCount > 1) && (iDANodeIndex >= 0)) { 1505 if ((pDevice->uAssocCount > 1) && (iDANodeIndex >= 0)) {
1506 bRelayPacketSend(pDevice, (PBYTE)(skb->data + cbHeaderOffset), FrameSize, (UINT)iDANodeIndex); 1506 bRelayPacketSend(pDevice, (PBYTE) (skb->data + cbHeaderOffset),
1507 FrameSize, (unsigned int) iDANodeIndex);
1507 } 1508 }
1508 1509
1509 if (bRelayOnly) 1510 if (bRelayOnly)
diff --git a/drivers/staging/vt6656/dpc.h b/drivers/staging/vt6656/dpc.h
index 7ea3ad973417..d4fca43af4fe 100644
--- a/drivers/staging/vt6656/dpc.h
+++ b/drivers/staging/vt6656/dpc.h
@@ -55,7 +55,7 @@ BOOL
55RXbBulkInProcessData( 55RXbBulkInProcessData(
56 PSDevice pDevice, 56 PSDevice pDevice,
57 PRCB pRCB, 57 PRCB pRCB,
58 ULONG BytesToIndicate 58 unsigned long BytesToIndicate
59 ); 59 );
60 60
61#endif /* __RXTX_H__ */ 61#endif /* __RXTX_H__ */
diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
index 93e52a3ebd85..f70e922a615b 100644
--- a/drivers/staging/vt6656/hostap.c
+++ b/drivers/staging/vt6656/hostap.c
@@ -210,7 +210,7 @@ int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
210static int hostap_remove_sta(PSDevice pDevice, 210static int hostap_remove_sta(PSDevice pDevice,
211 struct viawget_hostapd_param *param) 211 struct viawget_hostapd_param *param)
212{ 212{
213 UINT uNodeIndex; 213 unsigned int uNodeIndex;
214 214
215 215
216 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) { 216 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) {
@@ -239,7 +239,7 @@ static int hostap_add_sta(PSDevice pDevice,
239 struct viawget_hostapd_param *param) 239 struct viawget_hostapd_param *param)
240{ 240{
241 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 241 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
242 UINT uNodeIndex; 242 unsigned int uNodeIndex;
243 243
244 244
245 if (!BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) { 245 if (!BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) {
@@ -299,7 +299,7 @@ static int hostap_get_info_sta(PSDevice pDevice,
299 struct viawget_hostapd_param *param) 299 struct viawget_hostapd_param *param)
300{ 300{
301 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 301 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
302 UINT uNodeIndex; 302 unsigned int uNodeIndex;
303 303
304 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) { 304 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) {
305 param->u.get_info_sta.inactive_sec = 305 param->u.get_info_sta.inactive_sec =
@@ -333,7 +333,7 @@ static int hostap_reset_txexc_sta(PSDevice pDevice,
333 struct viawget_hostapd_param *param) 333 struct viawget_hostapd_param *param)
334{ 334{
335 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 335 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
336 UINT uNodeIndex; 336 unsigned int uNodeIndex;
337 337
338 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) { 338 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) {
339 pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts = 0; 339 pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts = 0;
@@ -363,13 +363,13 @@ static int hostap_set_flags_sta(PSDevice pDevice,
363 struct viawget_hostapd_param *param) 363 struct viawget_hostapd_param *param)
364{ 364{
365 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 365 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
366 UINT uNodeIndex; 366 unsigned int uNodeIndex;
367 367
368 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) { 368 if (BSSbIsSTAInNodeDB(pDevice, param->sta_addr, &uNodeIndex)) {
369 pMgmt->sNodeDBTable[uNodeIndex].dwFlags |= param->u.set_flags_sta.flags_or; 369 pMgmt->sNodeDBTable[uNodeIndex].dwFlags |= param->u.set_flags_sta.flags_or;
370 pMgmt->sNodeDBTable[uNodeIndex].dwFlags &= param->u.set_flags_sta.flags_and; 370 pMgmt->sNodeDBTable[uNodeIndex].dwFlags &= param->u.set_flags_sta.flags_and;
371 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " dwFlags = %x \n", 371 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " dwFlags = %x\n",
372 (UINT)pMgmt->sNodeDBTable[uNodeIndex].dwFlags); 372 (unsigned int) pMgmt->sNodeDBTable[uNodeIndex].dwFlags);
373 } 373 }
374 else { 374 else {
375 return -ENOENT; 375 return -ENOENT;
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c
index 368e49f782fc..19a84b66b097 100644
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@ -72,10 +72,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
72 SNodeList sNodeList; 72 SNodeList sNodeList;
73 PSBSSIDList pList; 73 PSBSSIDList pList;
74 PSNodeList pNodeList; 74 PSNodeList pNodeList;
75 UINT cbListCount; 75 unsigned int cbListCount;
76 PKnownBSS pBSS; 76 PKnownBSS pBSS;
77 PKnownNodeDB pNode; 77 PKnownNodeDB pNode;
78 UINT ii, jj; 78 unsigned int ii, jj;
79 SCmdLinkStatus sLinkStatus; 79 SCmdLinkStatus sLinkStatus;
80 BYTE abySuppRates[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16}; 80 BYTE abySuppRates[] = {WLAN_EID_SUPP_RATES, 4, 0x02, 0x04, 0x0B, 0x16};
81 BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; 81 BYTE abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -337,7 +337,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
337 pList->sBSSIDList[ii].wBeaconInterval = pBSS->wBeaconInterval; 337 pList->sBSSIDList[ii].wBeaconInterval = pBSS->wBeaconInterval;
338 pList->sBSSIDList[ii].wCapInfo = pBSS->wCapInfo; 338 pList->sBSSIDList[ii].wCapInfo = pBSS->wCapInfo;
339 RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); 339 RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
340 pList->sBSSIDList[ii].uRSSI = (UINT)ldBm; 340 pList->sBSSIDList[ii].uRSSI = (unsigned int) ldBm;
341// pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI; 341// pList->sBSSIDList[ii].uRSSI = pBSS->uRSSI;
342 memcpy(pList->sBSSIDList[ii].abyBSSID, pBSS->abyBSSID, WLAN_BSSID_LEN); 342 memcpy(pList->sBSSIDList[ii].abyBSSID, pBSS->abyBSSID, WLAN_BSSID_LEN);
343 pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID; 343 pItemSSID = (PWLAN_IE_SSID)pBSS->abySSID;
diff --git a/drivers/staging/vt6656/ioctl.h b/drivers/staging/vt6656/ioctl.h
index b307980999e9..caa4ac963d93 100644
--- a/drivers/staging/vt6656/ioctl.h
+++ b/drivers/staging/vt6656/ioctl.h
@@ -47,7 +47,7 @@ void vConfigWEPKey (
47 PSDevice pDevice, 47 PSDevice pDevice,
48 DWORD dwKeyIndex, 48 DWORD dwKeyIndex,
49 PBYTE pbyKey, 49 PBYTE pbyKey,
50 ULONG uKeyLength 50 unsigned long uKeyLength
51 ); 51 );
52*/ 52*/
53 53
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 4d0db21b1b98..fa40522d4a9a 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -769,7 +769,7 @@ int iwctl_siwap(struct net_device *dev,
769 //mike add: if desired AP is hidden ssid(there are two same BSSID in list), 769 //mike add: if desired AP is hidden ssid(there are two same BSSID in list),
770 // then ignore,because you don't known which one to be connect with?? 770 // then ignore,because you don't known which one to be connect with??
771 { 771 {
772 UINT ii , uSameBssidNum=0; 772 unsigned int ii, uSameBssidNum = 0;
773 for (ii = 0; ii < MAX_BSS_NUM; ii++) { 773 for (ii = 0; ii < MAX_BSS_NUM; ii++) {
774 if (pMgmt->sBSSList[ii].bActive && 774 if (pMgmt->sBSSList[ii].bActive &&
775 IS_ETH_ADDRESS_EQUAL(pMgmt->sBSSList[ii].abyBSSID,pMgmt->abyDesireBSSID)) { 775 IS_ETH_ADDRESS_EQUAL(pMgmt->sBSSList[ii].abyBSSID,pMgmt->abyDesireBSSID)) {
@@ -933,7 +933,7 @@ int iwctl_siwessid(struct net_device *dev,
933 { 933 {
934 PKnownBSS pCurr = NULL; 934 PKnownBSS pCurr = NULL;
935 BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 935 BYTE abyTmpDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
936 UINT ii , uSameBssidNum=0; 936 unsigned int ii, uSameBssidNum = 0;
937 937
938 memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID)); 938 memcpy(abyTmpDesireSSID,pMgmt->abyDesireSSID,sizeof(abyTmpDesireSSID));
939 pCurr = BSSpSearchBSSList(pDevice, 939 pCurr = BSSpSearchBSSList(pDevice,
@@ -1440,7 +1440,7 @@ int iwctl_giwencode(struct net_device *dev,
1440 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1440 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1441 int rc = 0; 1441 int rc = 0;
1442 char abyKey[WLAN_WEP232_KEYLEN]; 1442 char abyKey[WLAN_WEP232_KEYLEN];
1443 UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX); 1443 unsigned int index = (unsigned int)(wrq->flags & IW_ENCODE_INDEX);
1444 PSKeyItem pKey = NULL; 1444 PSKeyItem pKey = NULL;
1445 1445
1446 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n"); 1446 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");
@@ -1486,7 +1486,7 @@ int iwctl_giwencode(struct net_device *dev,
1486 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1486 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1487 char abyKey[WLAN_WEP232_KEYLEN]; 1487 char abyKey[WLAN_WEP232_KEYLEN];
1488 1488
1489 UINT index = (UINT)(wrq->flags & IW_ENCODE_INDEX); 1489 unsigned int index = (unsigned int)(wrq->flags & IW_ENCODE_INDEX);
1490 PSKeyItem pKey = NULL; 1490 PSKeyItem pKey = NULL;
1491 1491
1492 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n"); 1492 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWENCODE\n");
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index 7ff420d07c18..b0890c181e7d 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -223,7 +223,7 @@ BOOL KeybSetKey(
223 PSKeyManagement pTable, 223 PSKeyManagement pTable,
224 PBYTE pbyBSSID, 224 PBYTE pbyBSSID,
225 DWORD dwKeyIndex, 225 DWORD dwKeyIndex,
226 ULONG uKeyLength, 226 unsigned long uKeyLength,
227 PQWORD pKeyRSC, 227 PQWORD pKeyRSC,
228 PBYTE pbyKey, 228 PBYTE pbyKey,
229 BYTE byKeyDecMode 229 BYTE byKeyDecMode
@@ -231,9 +231,9 @@ BOOL KeybSetKey(
231{ 231{
232 PSDevice pDevice = (PSDevice) pDeviceHandler; 232 PSDevice pDevice = (PSDevice) pDeviceHandler;
233 int i,j; 233 int i,j;
234 UINT ii; 234 unsigned int ii;
235 PSKeyItem pKey; 235 PSKeyItem pKey;
236 UINT uKeyIdx; 236 unsigned int uKeyIdx;
237 237
238 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex); 238 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetKey: %lX\n", dwKeyIndex);
239 239
@@ -670,19 +670,19 @@ BOOL KeybSetDefaultKey(
670 void *pDeviceHandler, 670 void *pDeviceHandler,
671 PSKeyManagement pTable, 671 PSKeyManagement pTable,
672 DWORD dwKeyIndex, 672 DWORD dwKeyIndex,
673 ULONG uKeyLength, 673 unsigned long uKeyLength,
674 PQWORD pKeyRSC, 674 PQWORD pKeyRSC,
675 PBYTE pbyKey, 675 PBYTE pbyKey,
676 BYTE byKeyDecMode 676 BYTE byKeyDecMode
677 ) 677 )
678{ 678{
679 PSDevice pDevice = (PSDevice) pDeviceHandler; 679 PSDevice pDevice = (PSDevice) pDeviceHandler;
680 UINT ii; 680 unsigned int ii;
681 PSKeyItem pKey; 681 PSKeyItem pKey;
682 UINT uKeyIdx; 682 unsigned int uKeyIdx;
683
684 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetDefaultKey: %1x, %d \n", (int)dwKeyIndex, (int)uKeyLength);
685 683
684 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enter KeybSetDefaultKey: %1x, %d\n",
685 (int) dwKeyIndex, (int) uKeyLength);
686 686
687 if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key 687 if ((dwKeyIndex & PAIRWISE_KEY) != 0) { // Pairwise key
688 return (FALSE); 688 return (FALSE);
@@ -778,7 +778,7 @@ BOOL KeybSetAllGroupKey(
778 void *pDeviceHandler, 778 void *pDeviceHandler,
779 PSKeyManagement pTable, 779 PSKeyManagement pTable,
780 DWORD dwKeyIndex, 780 DWORD dwKeyIndex,
781 ULONG uKeyLength, 781 unsigned long uKeyLength,
782 PQWORD pKeyRSC, 782 PQWORD pKeyRSC,
783 PBYTE pbyKey, 783 PBYTE pbyKey,
784 BYTE byKeyDecMode 784 BYTE byKeyDecMode
@@ -786,9 +786,9 @@ BOOL KeybSetAllGroupKey(
786{ 786{
787 PSDevice pDevice = (PSDevice) pDeviceHandler; 787 PSDevice pDevice = (PSDevice) pDeviceHandler;
788 int i; 788 int i;
789 UINT ii; 789 unsigned int ii;
790 PSKeyItem pKey; 790 PSKeyItem pKey;
791 UINT uKeyIdx; 791 unsigned int uKeyIdx;
792 792
793 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex); 793 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Enter KeybSetAllGroupKey: %lX\n", dwKeyIndex);
794 794
diff --git a/drivers/staging/vt6656/key.h b/drivers/staging/vt6656/key.h
index 11fc41edd094..f749c7a027d3 100644
--- a/drivers/staging/vt6656/key.h
+++ b/drivers/staging/vt6656/key.h
@@ -58,7 +58,7 @@
58typedef struct tagSKeyItem 58typedef struct tagSKeyItem
59{ 59{
60 BOOL bKeyValid; 60 BOOL bKeyValid;
61 ULONG uKeyLength; 61 unsigned long uKeyLength;
62 BYTE abyKey[MAX_KEY_LEN]; 62 BYTE abyKey[MAX_KEY_LEN];
63 QWORD KeyRSC; 63 QWORD KeyRSC;
64 DWORD dwTSC47_16; 64 DWORD dwTSC47_16;
@@ -107,7 +107,7 @@ BOOL KeybSetKey(
107 PSKeyManagement pTable, 107 PSKeyManagement pTable,
108 PBYTE pbyBSSID, 108 PBYTE pbyBSSID,
109 DWORD dwKeyIndex, 109 DWORD dwKeyIndex,
110 ULONG uKeyLength, 110 unsigned long uKeyLength,
111 PQWORD pKeyRSC, 111 PQWORD pKeyRSC,
112 PBYTE pbyKey, 112 PBYTE pbyKey,
113 BYTE byKeyDecMode 113 BYTE byKeyDecMode
@@ -146,7 +146,7 @@ BOOL KeybSetDefaultKey(
146 void *pDeviceHandler, 146 void *pDeviceHandler,
147 PSKeyManagement pTable, 147 PSKeyManagement pTable,
148 DWORD dwKeyIndex, 148 DWORD dwKeyIndex,
149 ULONG uKeyLength, 149 unsigned long uKeyLength,
150 PQWORD pKeyRSC, 150 PQWORD pKeyRSC,
151 PBYTE pbyKey, 151 PBYTE pbyKey,
152 BYTE byKeyDecMode 152 BYTE byKeyDecMode
@@ -156,7 +156,7 @@ BOOL KeybSetAllGroupKey(
156 void *pDeviceHandler, 156 void *pDeviceHandler,
157 PSKeyManagement pTable, 157 PSKeyManagement pTable,
158 DWORD dwKeyIndex, 158 DWORD dwKeyIndex,
159 ULONG uKeyLength, 159 unsigned long uKeyLength,
160 PQWORD pKeyRSC, 160 PQWORD pKeyRSC,
161 PBYTE pbyKey, 161 PBYTE pbyKey,
162 BYTE byKeyDecMode 162 BYTE byKeyDecMode
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 71f09663e65d..0ab3db025f33 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -70,7 +70,7 @@ static int msglevel =MSG_LEVEL_INFO;
70 */ 70 */
71void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx) 71void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx)
72{ 72{
73 UINT uByteIdx; 73 unsigned int uByteIdx;
74 BYTE byBitMask; 74 BYTE byBitMask;
75 BYTE pbyData[2]; 75 BYTE pbyData[2];
76 76
@@ -110,7 +110,7 @@ void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx)
110 * Return Value: none 110 * Return Value: none
111 * 111 *
112 */ 112 */
113void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData) 113void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData)
114{ 114{
115 BYTE byData1; 115 BYTE byData1;
116 116
@@ -199,7 +199,7 @@ BYTE pbyData[4];
199 * Return Value: none 199 * Return Value: none
200 * 200 *
201 */ 201 */
202void MACvDisableKeyEntry (PSDevice pDevice, UINT uEntryIdx) 202void MACvDisableKeyEntry(PSDevice pDevice, unsigned int uEntryIdx)
203{ 203{
204WORD wOffset; 204WORD wOffset;
205BYTE byData; 205BYTE byData;
@@ -239,7 +239,9 @@ BYTE byData;
239 * Return Value: none 239 * Return Value: none
240 * 240 *
241 */ 241 */
242void MACvSetKeyEntry (PSDevice pDevice, WORD wKeyCtl, UINT uEntryIdx, UINT uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey) 242void MACvSetKeyEntry(PSDevice pDevice, WORD wKeyCtl,
243 unsigned int uEntryIdx, unsigned int uKeyIdx,
244 PBYTE pbyAddr, PDWORD pdwKey)
243{ 245{
244PBYTE pbyKey; 246PBYTE pbyKey;
245WORD wOffset; 247WORD wOffset;
@@ -247,10 +249,6 @@ DWORD dwData1,dwData2;
247int ii; 249int ii;
248BYTE pbyData[24]; 250BYTE pbyData[24];
249 251
250
251
252
253
254 if ( pDevice->byLocalID <= MAC_REVISION_A1 ) { 252 if ( pDevice->byLocalID <= MAC_REVISION_A1 ) {
255 if ( pDevice->sMgmtObj.byCSSPK == KEY_CTL_CCMP ) 253 if ( pDevice->sMgmtObj.byCSSPK == KEY_CTL_CCMP )
256 return; 254 return;
diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index 4e3d11b4a8be..775c70928ec7 100644
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -421,12 +421,13 @@
421/*--------------------- Export Functions --------------------------*/ 421/*--------------------- Export Functions --------------------------*/
422 422
423void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx); 423void MACvSetMultiAddrByHash (PSDevice pDevice, BYTE byHashIdx);
424void MACvWriteMultiAddr(PSDevice pDevice, UINT uByteIdx, BYTE byData); 424void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData);
425BOOL MACbShutdown(PSDevice pDevice);; 425BOOL MACbShutdown(PSDevice pDevice);;
426void MACvSetBBType(PSDevice pDevice,BYTE byType); 426void MACvSetBBType(PSDevice pDevice,BYTE byType);
427void MACvSetMISCFifo (PSDevice pDevice, WORD wOffset, DWORD dwData); 427void MACvSetMISCFifo (PSDevice pDevice, WORD wOffset, DWORD dwData);
428void MACvDisableKeyEntry(PSDevice pDevice, UINT uEntryIdx); 428void MACvDisableKeyEntry(PSDevice pDevice, unsigned int uEntryIdx);
429void MACvSetKeyEntry(PSDevice pDevice, WORD wKeyCtl, UINT uEntryIdx, UINT uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey); 429void MACvSetKeyEntry(PSDevice pDevice, WORD wKeyCtl, unsigned int uEntryIdx,
430 unsigned int uKeyIdx, PBYTE pbyAddr, PDWORD pdwKey);
430 431
431void MACvRegBitsOff(PSDevice pDevice, BYTE byRegOfs, BYTE byBits); 432void MACvRegBitsOff(PSDevice pDevice, BYTE byRegOfs, BYTE byBits);
432void MACvRegBitsOn(PSDevice pDevice, BYTE byRegOfs, BYTE byBits); 433void MACvRegBitsOn(PSDevice pDevice, BYTE byRegOfs, BYTE byBits);
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index e4dc27dd21e7..4e465c465280 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -277,8 +277,10 @@ static void device_free_frag_bufs(PSDevice pDevice);
277static BOOL device_alloc_bufs(PSDevice pDevice); 277static BOOL device_alloc_bufs(PSDevice pDevice);
278 278
279static int Read_config_file(PSDevice pDevice); 279static int Read_config_file(PSDevice pDevice);
280static UCHAR *Config_FileOperation(PSDevice pDevice); 280static unsigned char *Config_FileOperation(PSDevice pDevice);
281static int Config_FileGetParameter(UCHAR *string, UCHAR *dest,UCHAR *source); 281static int Config_FileGetParameter(unsigned char *string,
282 unsigned char *dest,
283 unsigned char *source);
282 284
283//2008-0714<Add>by Mike Liu 285//2008-0714<Add>by Mike Liu
284static BOOL device_release_WPADEV(PSDevice pDevice); 286static BOOL device_release_WPADEV(PSDevice pDevice);
@@ -334,17 +336,17 @@ device_set_options(PSDevice pDevice) {
334static void device_init_diversity_timer(PSDevice pDevice) 336static void device_init_diversity_timer(PSDevice pDevice)
335{ 337{
336 init_timer(&pDevice->TimerSQ3Tmax1); 338 init_timer(&pDevice->TimerSQ3Tmax1);
337 pDevice->TimerSQ3Tmax1.data = (ULONG)pDevice; 339 pDevice->TimerSQ3Tmax1.data = (unsigned long)pDevice;
338 pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack; 340 pDevice->TimerSQ3Tmax1.function = (TimerFunction)TimerSQ3CallBack;
339 pDevice->TimerSQ3Tmax1.expires = RUN_AT(HZ); 341 pDevice->TimerSQ3Tmax1.expires = RUN_AT(HZ);
340 342
341 init_timer(&pDevice->TimerSQ3Tmax2); 343 init_timer(&pDevice->TimerSQ3Tmax2);
342 pDevice->TimerSQ3Tmax2.data = (ULONG)pDevice; 344 pDevice->TimerSQ3Tmax2.data = (unsigned long)pDevice;
343 pDevice->TimerSQ3Tmax2.function = (TimerFunction)TimerSQ3CallBack; 345 pDevice->TimerSQ3Tmax2.function = (TimerFunction)TimerSQ3CallBack;
344 pDevice->TimerSQ3Tmax2.expires = RUN_AT(HZ); 346 pDevice->TimerSQ3Tmax2.expires = RUN_AT(HZ);
345 347
346 init_timer(&pDevice->TimerSQ3Tmax3); 348 init_timer(&pDevice->TimerSQ3Tmax3);
347 pDevice->TimerSQ3Tmax3.data = (ULONG)pDevice; 349 pDevice->TimerSQ3Tmax3.data = (unsigned long)pDevice;
348 pDevice->TimerSQ3Tmax3.function = (TimerFunction)TimerSQ3Tmax3CallBack; 350 pDevice->TimerSQ3Tmax3.function = (TimerFunction)TimerSQ3Tmax3CallBack;
349 pDevice->TimerSQ3Tmax3.expires = RUN_AT(HZ); 351 pDevice->TimerSQ3Tmax3.expires = RUN_AT(HZ);
350 352
@@ -362,7 +364,7 @@ static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
362 u8 abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}; 364 u8 abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00};
363 u8 abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8}; 365 u8 abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8};
364 BYTE byAntenna; 366 BYTE byAntenna;
365 UINT ii; 367 unsigned int ii;
366 CMD_CARD_INIT sInitCmd; 368 CMD_CARD_INIT sInitCmd;
367 NTSTATUS ntStatus = STATUS_SUCCESS; 369 NTSTATUS ntStatus = STATUS_SUCCESS;
368 RSP_CARD_INIT sInitRsp; 370 RSP_CARD_INIT sInitRsp;
@@ -1336,7 +1338,7 @@ device_release_WPADEV(pDevice);
1336static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) { 1338static int device_dma0_tx_80211(struct sk_buff *skb, struct net_device *dev) {
1337 PSDevice pDevice=netdev_priv(dev); 1339 PSDevice pDevice=netdev_priv(dev);
1338 PBYTE pbMPDU; 1340 PBYTE pbMPDU;
1339 UINT cbMPDULen = 0; 1341 unsigned int cbMPDULen = 0;
1340 1342
1341 1343
1342 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211\n"); 1344 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_dma0_tx_80211\n");
@@ -1411,24 +1413,27 @@ static inline u32 ether_crc(int length, unsigned char *data)
1411} 1413}
1412 1414
1413//find out the start position of str2 from str1 1415//find out the start position of str2 from str1
1414static UCHAR *kstrstr(const UCHAR *str1,const UCHAR *str2) { 1416static unsigned char *kstrstr(const unsigned char *str1,
1415 int str1_len=strlen(str1); 1417 const unsigned char *str2) {
1416 int str2_len=strlen(str2); 1418 int str1_len = strlen(str1);
1419 int str2_len = strlen(str2);
1417 1420
1418 while (str1_len >= str2_len) { 1421 while (str1_len >= str2_len) {
1419 str1_len--; 1422 str1_len--;
1420 if(memcmp(str1,str2,str2_len)==0) 1423 if(memcmp(str1,str2,str2_len)==0)
1421 return (UCHAR *)str1; 1424 return (unsigned char *) str1;
1422 str1++; 1425 str1++;
1423 } 1426 }
1424 return NULL; 1427 return NULL;
1425} 1428}
1426 1429
1427static int Config_FileGetParameter(UCHAR *string, UCHAR *dest,UCHAR *source) 1430static int Config_FileGetParameter(unsigned char *string,
1431 unsigned char *dest,
1432 unsigned char *source)
1428{ 1433{
1429 UCHAR buf1[100]; 1434 unsigned char buf1[100];
1430 UCHAR buf2[100]; 1435 unsigned char buf2[100];
1431 UCHAR *start_p=NULL,*end_p=NULL,*tmp_p=NULL; 1436 unsigned char *start_p = NULL, *end_p = NULL, *tmp_p = NULL;
1432 int ii; 1437 int ii;
1433 1438
1434 memset(buf1,0,100); 1439 memset(buf1,0,100);
@@ -1480,13 +1485,14 @@ for(ii=1;;ii++) {
1480} 1485}
1481 1486
1482//if read fail,return NULL,or return data pointer; 1487//if read fail,return NULL,or return data pointer;
1483static UCHAR *Config_FileOperation(PSDevice pDevice) { 1488static unsigned char *Config_FileOperation(PSDevice pDevice)
1484 UCHAR *config_path=CONFIG_PATH; 1489{
1485 UCHAR *buffer=NULL; 1490 unsigned char *config_path = CONFIG_PATH;
1491 unsigned char *buffer = NULL;
1486 struct file *filp=NULL; 1492 struct file *filp=NULL;
1487 mm_segment_t old_fs = get_fs(); 1493 mm_segment_t old_fs = get_fs();
1488 //int oldfsuid=0,oldfsgid=0; 1494 //int oldfsuid=0,oldfsgid=0;
1489 int result=0; 1495 int result = 0;
1490 1496
1491 set_fs (KERNEL_DS); 1497 set_fs (KERNEL_DS);
1492 /* Can't do this anymore, so we rely on correct filesystem permissions: 1498 /* Can't do this anymore, so we rely on correct filesystem permissions:
@@ -1545,9 +1551,9 @@ if(result!=0) {
1545 1551
1546//return --->-1:fail; >=0:successful 1552//return --->-1:fail; >=0:successful
1547static int Read_config_file(PSDevice pDevice) { 1553static int Read_config_file(PSDevice pDevice) {
1548 int result=0; 1554 int result = 0;
1549 UCHAR tmpbuffer[100]; 1555 unsigned char tmpbuffer[100];
1550 UCHAR *buffer=NULL; 1556 unsigned char *buffer = NULL;
1551 1557
1552 //init config setting 1558 //init config setting
1553 pDevice->config_file.ZoneType = -1; 1559 pDevice->config_file.ZoneType = -1;
diff --git a/drivers/staging/vt6656/mib.c b/drivers/staging/vt6656/mib.c
index efcd81c042f2..b694fc86d740 100644
--- a/drivers/staging/vt6656/mib.c
+++ b/drivers/staging/vt6656/mib.c
@@ -152,9 +152,10 @@ void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, BYTE byIsr0, BYTE byIsr
152 * Return Value: none 152 * Return Value: none
153 * 153 *
154 */ 154 */
155void STAvUpdateRDStatCounter (PSStatCounter pStatistic, 155void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
156 BYTE byRSR, BYTE byNewRSR, BYTE byRxSts, BYTE byRxRate, 156 BYTE byRSR, BYTE byNewRSR,
157 PBYTE pbyBuffer, UINT cbFrameLength) 157 BYTE byRxSts, BYTE byRxRate,
158 PBYTE pbyBuffer, unsigned int cbFrameLength)
158{ 159{
159 /* need change */ 160 /* need change */
160 PS802_11Header pHeader = (PS802_11Header)pbyBuffer; 161 PS802_11Header pHeader = (PS802_11Header)pbyBuffer;
@@ -169,15 +170,18 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
169 /* update counters in case of successful transmission */ 170 /* update counters in case of successful transmission */
170 if (byRSR & RSR_ADDRBROAD) { 171 if (byRSR & RSR_ADDRBROAD) {
171 pStatistic->ullRxBroadcastFrames++; 172 pStatistic->ullRxBroadcastFrames++;
172 pStatistic->ullRxBroadcastBytes += (ULONGLONG)cbFrameLength; 173 pStatistic->ullRxBroadcastBytes +=
174 (unsigned long long) cbFrameLength;
173 } 175 }
174 else if (byRSR & RSR_ADDRMULTI) { 176 else if (byRSR & RSR_ADDRMULTI) {
175 pStatistic->ullRxMulticastFrames++; 177 pStatistic->ullRxMulticastFrames++;
176 pStatistic->ullRxMulticastBytes += (ULONGLONG)cbFrameLength; 178 pStatistic->ullRxMulticastBytes +=
179 (unsigned long long) cbFrameLength;
177 } 180 }
178 else { 181 else {
179 pStatistic->ullRxDirectedFrames++; 182 pStatistic->ullRxDirectedFrames++;
180 pStatistic->ullRxDirectedBytes += (ULONGLONG)cbFrameLength; 183 pStatistic->ullRxDirectedBytes +=
184 (unsigned long long) cbFrameLength;
181 } 185 }
182 } 186 }
183 } 187 }
@@ -396,7 +400,7 @@ STAvUpdateRDStatCounterEx (
396 BYTE byRxSts, 400 BYTE byRxSts,
397 BYTE byRxRate, 401 BYTE byRxRate,
398 PBYTE pbyBuffer, 402 PBYTE pbyBuffer,
399 UINT cbFrameLength 403 unsigned int cbFrameLength
400 ) 404 )
401{ 405{
402 STAvUpdateRDStatCounter( 406 STAvUpdateRDStatCounter(
@@ -536,19 +540,22 @@ STAvUpdate802_11Counter(
536 ) 540 )
537{ 541{
538 //p802_11Counter->TransmittedFragmentCount 542 //p802_11Counter->TransmittedFragmentCount
539 p802_11Counter->MulticastTransmittedFrameCount = (ULONGLONG) (pStatistic->dwTsrBroadcast + 543 p802_11Counter->MulticastTransmittedFrameCount =
540 pStatistic->dwTsrMulticast); 544 (unsigned long long) (pStatistic->dwTsrBroadcast +
541 p802_11Counter->FailedCount = (ULONGLONG) (pStatistic->dwTsrErr); 545 pStatistic->dwTsrMulticast);
542 p802_11Counter->RetryCount = (ULONGLONG) (pStatistic->dwTsrRetry); 546 p802_11Counter->FailedCount = (unsigned long long) (pStatistic->dwTsrErr);
543 p802_11Counter->MultipleRetryCount = (ULONGLONG) (pStatistic->dwTsrMoreThanOnceRetry); 547 p802_11Counter->RetryCount = (unsigned long long) (pStatistic->dwTsrRetry);
548 p802_11Counter->MultipleRetryCount =
549 (unsigned long long) (pStatistic->dwTsrMoreThanOnceRetry);
544 //p802_11Counter->FrameDuplicateCount 550 //p802_11Counter->FrameDuplicateCount
545 p802_11Counter->RTSSuccessCount += (ULONGLONG) byRTSSuccess; 551 p802_11Counter->RTSSuccessCount += (unsigned long long) byRTSSuccess;
546 p802_11Counter->RTSFailureCount += (ULONGLONG) byRTSFail; 552 p802_11Counter->RTSFailureCount += (unsigned long long) byRTSFail;
547 p802_11Counter->ACKFailureCount += (ULONGLONG) byACKFail; 553 p802_11Counter->ACKFailureCount += (unsigned long long) byACKFail;
548 p802_11Counter->FCSErrorCount += (ULONGLONG) byFCSErr; 554 p802_11Counter->FCSErrorCount += (unsigned long long) byFCSErr;
549 //p802_11Counter->ReceivedFragmentCount 555 //p802_11Counter->ReceivedFragmentCount
550 p802_11Counter->MulticastReceivedFrameCount = (ULONGLONG) (pStatistic->dwRsrBroadcast + 556 p802_11Counter->MulticastReceivedFrameCount =
551 pStatistic->dwRsrMulticast); 557 (unsigned long long) (pStatistic->dwRsrBroadcast +
558 pStatistic->dwRsrMulticast);
552} 559}
553 560
554/* 561/*
diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h
index 8cc5b3f0d70e..0455ec9d327d 100644
--- a/drivers/staging/vt6656/mib.h
+++ b/drivers/staging/vt6656/mib.h
@@ -52,32 +52,34 @@ typedef struct tagSUSBCounter {
52 52
53 53
54typedef struct tagSDot11Counters { 54typedef struct tagSDot11Counters {
55// ULONG Length; // Length of structure 55 /* unsigned long Length; // Length of structure */
56 ULONGLONG TransmittedFragmentCount; 56 unsigned long long TransmittedFragmentCount;
57 ULONGLONG MulticastTransmittedFrameCount; 57 unsigned long long MulticastTransmittedFrameCount;
58 ULONGLONG FailedCount; 58 unsigned long long FailedCount;
59 ULONGLONG RetryCount; 59 unsigned long long RetryCount;
60 ULONGLONG MultipleRetryCount; 60 unsigned long long MultipleRetryCount;
61 ULONGLONG RTSSuccessCount; 61 unsigned long long RTSSuccessCount;
62 ULONGLONG RTSFailureCount; 62 unsigned long long RTSFailureCount;
63 ULONGLONG ACKFailureCount; 63 unsigned long long ACKFailureCount;
64 ULONGLONG FrameDuplicateCount; 64 unsigned long long FrameDuplicateCount;
65 ULONGLONG ReceivedFragmentCount; 65 unsigned long long ReceivedFragmentCount;
66 ULONGLONG MulticastReceivedFrameCount; 66 unsigned long long MulticastReceivedFrameCount;
67 ULONGLONG FCSErrorCount; 67 unsigned long long FCSErrorCount;
68 ULONGLONG TKIPLocalMICFailures; 68 unsigned long long TKIPLocalMICFailures;
69 ULONGLONG TKIPRemoteMICFailures; 69 unsigned long long TKIPRemoteMICFailures;
70 ULONGLONG TKIPICVErrors; 70 unsigned long long TKIPICVErrors;
71 ULONGLONG TKIPCounterMeasuresInvoked; 71 unsigned long long TKIPCounterMeasuresInvoked;
72 ULONGLONG TKIPReplays; 72 unsigned long long TKIPReplays;
73 ULONGLONG CCMPFormatErrors; 73 unsigned long long CCMPFormatErrors;
74 ULONGLONG CCMPReplays; 74 unsigned long long CCMPReplays;
75 ULONGLONG CCMPDecryptErrors; 75 unsigned long long CCMPDecryptErrors;
76 ULONGLONG FourWayHandshakeFailures; 76 unsigned long long FourWayHandshakeFailures;
77// ULONGLONG WEPUndecryptableCount; 77 /*
78// ULONGLONG WEPICVErrorCount; 78 * unsigned long long WEPUndecryptableCount;
79// ULONGLONG DecryptSuccessCount; 79 * unsigned long long WEPICVErrorCount;
80// ULONGLONG DecryptFailureCount; 80 * unsigned long long DecryptSuccessCount;
81 * unsigned long long DecryptFailureCount;
82 */
81} SDot11Counters, *PSDot11Counters; 83} SDot11Counters, *PSDot11Counters;
82 84
83 85
@@ -151,37 +153,37 @@ typedef struct tagSRmonCounter {
151// Custom counter 153// Custom counter
152// 154//
153typedef struct tagSCustomCounters { 155typedef struct tagSCustomCounters {
154 ULONG Length; 156 unsigned long Length;
155 157
156 ULONGLONG ullTsrAllOK; 158 unsigned long long ullTsrAllOK;
157 159
158 ULONGLONG ullRsr11M; 160 unsigned long long ullRsr11M;
159 ULONGLONG ullRsr5M; 161 unsigned long long ullRsr5M;
160 ULONGLONG ullRsr2M; 162 unsigned long long ullRsr2M;
161 ULONGLONG ullRsr1M; 163 unsigned long long ullRsr1M;
162 164
163 ULONGLONG ullRsr11MCRCOk; 165 unsigned long long ullRsr11MCRCOk;
164 ULONGLONG ullRsr5MCRCOk; 166 unsigned long long ullRsr5MCRCOk;
165 ULONGLONG ullRsr2MCRCOk; 167 unsigned long long ullRsr2MCRCOk;
166 ULONGLONG ullRsr1MCRCOk; 168 unsigned long long ullRsr1MCRCOk;
167 169
168 ULONGLONG ullRsr54M; 170 unsigned long long ullRsr54M;
169 ULONGLONG ullRsr48M; 171 unsigned long long ullRsr48M;
170 ULONGLONG ullRsr36M; 172 unsigned long long ullRsr36M;
171 ULONGLONG ullRsr24M; 173 unsigned long long ullRsr24M;
172 ULONGLONG ullRsr18M; 174 unsigned long long ullRsr18M;
173 ULONGLONG ullRsr12M; 175 unsigned long long ullRsr12M;
174 ULONGLONG ullRsr9M; 176 unsigned long long ullRsr9M;
175 ULONGLONG ullRsr6M; 177 unsigned long long ullRsr6M;
176 178
177 ULONGLONG ullRsr54MCRCOk; 179 unsigned long long ullRsr54MCRCOk;
178 ULONGLONG ullRsr48MCRCOk; 180 unsigned long long ullRsr48MCRCOk;
179 ULONGLONG ullRsr36MCRCOk; 181 unsigned long long ullRsr36MCRCOk;
180 ULONGLONG ullRsr24MCRCOk; 182 unsigned long long ullRsr24MCRCOk;
181 ULONGLONG ullRsr18MCRCOk; 183 unsigned long long ullRsr18MCRCOk;
182 ULONGLONG ullRsr12MCRCOk; 184 unsigned long long ullRsr12MCRCOk;
183 ULONGLONG ullRsr9MCRCOk; 185 unsigned long long ullRsr9MCRCOk;
184 ULONGLONG ullRsr6MCRCOk; 186 unsigned long long ullRsr6MCRCOk;
185 187
186} SCustomCounters, *PSCustomCounters; 188} SCustomCounters, *PSCustomCounters;
187 189
@@ -190,7 +192,7 @@ typedef struct tagSCustomCounters {
190// Custom counter 192// Custom counter
191// 193//
192typedef struct tagSISRCounters { 194typedef struct tagSISRCounters {
193 ULONG Length; 195 unsigned long Length;
194 196
195 DWORD dwIsrTx0OK; 197 DWORD dwIsrTx0OK;
196 DWORD dwIsrAC0TxOK; 198 DWORD dwIsrAC0TxOK;
@@ -277,15 +279,15 @@ typedef struct tagSStatCounter {
277 DWORD dwRsrMulticast; 279 DWORD dwRsrMulticast;
278 DWORD dwRsrDirected; 280 DWORD dwRsrDirected;
279 // 64-bit OID 281 // 64-bit OID
280 ULONGLONG ullRsrOK; 282 unsigned long long ullRsrOK;
281 283
282 // for some optional OIDs (64 bits) and DMI support 284 // for some optional OIDs (64 bits) and DMI support
283 ULONGLONG ullRxBroadcastBytes; 285 unsigned long long ullRxBroadcastBytes;
284 ULONGLONG ullRxMulticastBytes; 286 unsigned long long ullRxMulticastBytes;
285 ULONGLONG ullRxDirectedBytes; 287 unsigned long long ullRxDirectedBytes;
286 ULONGLONG ullRxBroadcastFrames; 288 unsigned long long ullRxBroadcastFrames;
287 ULONGLONG ullRxMulticastFrames; 289 unsigned long long ullRxMulticastFrames;
288 ULONGLONG ullRxDirectedFrames; 290 unsigned long long ullRxDirectedFrames;
289 291
290 DWORD dwRsrRxFragment; 292 DWORD dwRsrRxFragment;
291 DWORD dwRsrRxFrmLen64; 293 DWORD dwRsrRxFrmLen64;
@@ -330,15 +332,15 @@ typedef struct tagSStatCounter {
330 332
331 333
332 // 64-bit OID 334 // 64-bit OID
333 ULONGLONG ullTsrOK; 335 unsigned long long ullTsrOK;
334 336
335 // for some optional OIDs (64 bits) and DMI support 337 // for some optional OIDs (64 bits) and DMI support
336 ULONGLONG ullTxBroadcastFrames; 338 unsigned long long ullTxBroadcastFrames;
337 ULONGLONG ullTxMulticastFrames; 339 unsigned long long ullTxMulticastFrames;
338 ULONGLONG ullTxDirectedFrames; 340 unsigned long long ullTxDirectedFrames;
339 ULONGLONG ullTxBroadcastBytes; 341 unsigned long long ullTxBroadcastBytes;
340 ULONGLONG ullTxMulticastBytes; 342 unsigned long long ullTxMulticastBytes;
341 ULONGLONG ullTxDirectedBytes; 343 unsigned long long ullTxDirectedBytes;
342 344
343 // for autorate 345 // for autorate
344 DWORD dwTxOk[MAX_RATE+1]; 346 DWORD dwTxOk[MAX_RATE+1];
@@ -356,15 +358,15 @@ typedef struct tagSStatCounter {
356 358
357 #ifdef Calcu_LinkQual 359 #ifdef Calcu_LinkQual
358 //Tx count: 360 //Tx count:
359 ULONG TxNoRetryOkCount; //success tx no retry ! 361 unsigned long TxNoRetryOkCount; /* success tx no retry ! */
360 ULONG TxRetryOkCount; //success tx but retry ! 362 unsigned long TxRetryOkCount; /* success tx but retry ! */
361 ULONG TxFailCount; //fail tx ? 363 unsigned long TxFailCount; /* fail tx ? */
362 //Rx count: 364 //Rx count:
363 ULONG RxOkCnt; //success rx ! 365 unsigned long RxOkCnt; /* success rx ! */
364 ULONG RxFcsErrCnt; //fail rx ? 366 unsigned long RxFcsErrCnt; /* fail rx ? */
365 //statistic 367 //statistic
366 ULONG SignalStren; 368 unsigned long SignalStren;
367 ULONG LinkQuality; 369 unsigned long LinkQuality;
368 #endif 370 #endif
369 371
370} SStatCounter, *PSStatCounter; 372} SStatCounter, *PSStatCounter;
@@ -382,13 +384,14 @@ void STAvClearAllCounter(PSStatCounter pStatistic);
382void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, BYTE byIsr0, BYTE byIsr1); 384void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, BYTE byIsr0, BYTE byIsr1);
383 385
384void STAvUpdateRDStatCounter(PSStatCounter pStatistic, 386void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
385 BYTE byRSR, BYTE byNewRSR, BYTE byRxSts, BYTE byRxRate, 387 BYTE byRSR, BYTE byNewRSR, BYTE byRxSts,
386 PBYTE pbyBuffer, UINT cbFrameLength); 388 BYTE byRxRate, PBYTE pbyBuffer,
389 unsigned int cbFrameLength);
387 390
388void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic, 391void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic,
389 BYTE byRSR, BYTE byNewRSR, BYTE byRxSts, BYTE byRxRate, 392 BYTE byRSR, BYTE byNewRSR, BYTE byRxSts,
390 PBYTE pbyBuffer, UINT cbFrameLength); 393 BYTE byRxRate, PBYTE pbyBuffer,
391 394 unsigned int cbFrameLength);
392 395
393void 396void
394STAvUpdateTDStatCounter ( 397STAvUpdateTDStatCounter (
diff --git a/drivers/staging/vt6656/michael.c b/drivers/staging/vt6656/michael.c
index d45333fc2420..671a8cf33e23 100644
--- a/drivers/staging/vt6656/michael.c
+++ b/drivers/staging/vt6656/michael.c
@@ -64,7 +64,7 @@ static void s_vAppendByte(BYTE b); /* Add a single byte to the internal
64static DWORD L, R; /* Current state */ 64static DWORD L, R; /* Current state */
65static DWORD K0, K1; /* Key */ 65static DWORD K0, K1; /* Key */
66static DWORD M; /* Message accumulator (single word) */ 66static DWORD M; /* Message accumulator (single word) */
67static UINT nBytesInM; /* # bytes in M */ 67static unsigned int nBytesInM; /* # bytes in M */
68 68
69/*--------------------- Export Functions --------------------------*/ 69/*--------------------- Export Functions --------------------------*/
70 70
@@ -73,7 +73,7 @@ static DWORD s_dwGetUINT32 (BYTE * p)
73// Convert from BYTE[] to DWORD in a portable way 73// Convert from BYTE[] to DWORD in a portable way
74{ 74{
75 DWORD res = 0; 75 DWORD res = 0;
76 UINT i; 76 unsigned int i;
77 for(i=0; i<4; i++ ) 77 for(i=0; i<4; i++ )
78 res |= (*p++) << (8*i); 78 res |= (*p++) << (8*i);
79 return res; 79 return res;
@@ -82,7 +82,7 @@ static DWORD s_dwGetUINT32 (BYTE * p)
82static void s_vPutUINT32(BYTE *p, DWORD val) 82static void s_vPutUINT32(BYTE *p, DWORD val)
83// Convert from DWORD to BYTE[] in a portable way 83// Convert from DWORD to BYTE[] in a portable way
84{ 84{
85 UINT i; 85 unsigned int i;
86 for(i=0; i<4; i++ ) { 86 for(i=0; i<4; i++ ) {
87 *p++ = (BYTE) (val & 0xff); 87 *p++ = (BYTE) (val & 0xff);
88 val >>= 8; 88 val >>= 8;
@@ -148,7 +148,7 @@ void MIC_vUnInit(void)
148 s_vClear(); 148 s_vClear();
149} 149}
150 150
151void MIC_vAppend(PBYTE src, UINT nBytes) 151void MIC_vAppend(PBYTE src, unsigned int nBytes)
152{ 152{
153 /* This is simple */ 153 /* This is simple */
154 while (nBytes > 0) { 154 while (nBytes > 0) {
diff --git a/drivers/staging/vt6656/michael.h b/drivers/staging/vt6656/michael.h
index 52270d314a8b..3ab60928ef35 100644
--- a/drivers/staging/vt6656/michael.h
+++ b/drivers/staging/vt6656/michael.h
@@ -40,7 +40,7 @@ void MIC_vInit(DWORD dwK0, DWORD dwK1);
40void MIC_vUnInit(void); 40void MIC_vUnInit(void);
41 41
42// Append bytes to the message to be MICed 42// Append bytes to the message to be MICed
43void MIC_vAppend(PBYTE src, UINT nBytes); 43void MIC_vAppend(PBYTE src, unsigned int nBytes);
44 44
45// Get the MIC result. Destination should accept 8 bytes of result. 45// Get the MIC result. Destination should accept 8 bytes of result.
46// This also resets the message to empty. 46// This also resets the message to empty.
diff --git a/drivers/staging/vt6656/rc4.c b/drivers/staging/vt6656/rc4.c
index 487f1dcfd8c4..5c3c2d0552b4 100644
--- a/drivers/staging/vt6656/rc4.c
+++ b/drivers/staging/vt6656/rc4.c
@@ -32,13 +32,13 @@
32 32
33#include "rc4.h" 33#include "rc4.h"
34 34
35void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len) 35void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len)
36{ 36{
37 UINT ust1, ust2; 37 unsigned int ust1, ust2;
38 UINT keyindex; 38 unsigned int keyindex;
39 UINT stateindex; 39 unsigned int stateindex;
40 PBYTE pbyst; 40 PBYTE pbyst;
41 UINT idx; 41 unsigned int idx;
42 42
43 pbyst = pRC4->abystate; 43 pbyst = pRC4->abystate;
44 pRC4->ux = 0; 44 pRC4->ux = 0;
@@ -58,11 +58,11 @@ void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len)
58 } 58 }
59} 59}
60 60
61UINT rc4_byte(PRC4Ext pRC4) 61unsigned int rc4_byte(PRC4Ext pRC4)
62{ 62{
63 UINT ux; 63 unsigned int ux;
64 UINT uy; 64 unsigned int uy;
65 UINT ustx, usty; 65 unsigned int ustx, usty;
66 PBYTE pbyst; 66 PBYTE pbyst;
67 67
68 pbyst = pRC4->abystate; 68 pbyst = pRC4->abystate;
@@ -79,9 +79,9 @@ UINT rc4_byte(PRC4Ext pRC4)
79} 79}
80 80
81void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, 81void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest,
82 PBYTE pbySrc, UINT cbData_len) 82 PBYTE pbySrc, unsigned int cbData_len)
83{ 83{
84 UINT ii; 84 unsigned int ii;
85 for (ii = 0; ii < cbData_len; ii++) 85 for (ii = 0; ii < cbData_len; ii++)
86 pbyDest[ii] = (BYTE)(pbySrc[ii] ^ rc4_byte(pRC4)); 86 pbyDest[ii] = (BYTE)(pbySrc[ii] ^ rc4_byte(pRC4));
87} 87}
diff --git a/drivers/staging/vt6656/rc4.h b/drivers/staging/vt6656/rc4.h
index 9cd1db9276bc..d447879c8f99 100644
--- a/drivers/staging/vt6656/rc4.h
+++ b/drivers/staging/vt6656/rc4.h
@@ -35,13 +35,14 @@
35/*--------------------- Export Definitions -------------------------*/ 35/*--------------------- Export Definitions -------------------------*/
36/*--------------------- Export Types ------------------------------*/ 36/*--------------------- Export Types ------------------------------*/
37typedef struct { 37typedef struct {
38 UINT ux; 38 unsigned int ux;
39 UINT uy; 39 unsigned int uy;
40 BYTE abystate[256]; 40 BYTE abystate[256];
41} RC4Ext, *PRC4Ext; 41} RC4Ext, *PRC4Ext;
42 42
43void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, UINT cbKey_len); 43void rc4_init(PRC4Ext pRC4, PBYTE pbyKey, unsigned int cbKey_len);
44UINT rc4_byte(PRC4Ext pRC4); 44unsigned int rc4_byte(PRC4Ext pRC4);
45void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc, UINT cbData_len); 45void rc4_encrypt(PRC4Ext pRC4, PBYTE pbyDest, PBYTE pbySrc,
46 unsigned int cbData_len);
46 47
47#endif /* __RC4_H__ */ 48#endif /* __RC4_H__ */
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index 4c4f5f6dc366..3fd0478a9a54 100644
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -758,8 +758,8 @@ BOOL IFRFbWriteEmbeded (PSDevice pDevice, DWORD dwData)
758 */ 758 */
759BOOL RFbSetPower ( 759BOOL RFbSetPower (
760 PSDevice pDevice, 760 PSDevice pDevice,
761 UINT uRATE, 761 unsigned int uRATE,
762 UINT uCH 762 unsigned int uCH
763 ) 763 )
764{ 764{
765BOOL bResult = TRUE; 765BOOL bResult = TRUE;
@@ -813,7 +813,7 @@ BYTE byPwr = pDevice->byCCKPwr;
813BOOL RFbRawSetPower ( 813BOOL RFbRawSetPower (
814 PSDevice pDevice, 814 PSDevice pDevice,
815 BYTE byPwr, 815 BYTE byPwr,
816 UINT uRATE 816 unsigned int uRATE
817 ) 817 )
818{ 818{
819BOOL bResult = TRUE; 819BOOL bResult = TRUE;
diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h
index 7423d4daba01..d4f8b94132b9 100644
--- a/drivers/staging/vt6656/rf.h
+++ b/drivers/staging/vt6656/rf.h
@@ -66,14 +66,14 @@ extern const BYTE RFaby11aChannelIndex[200];
66BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData); 66BOOL IFRFbWriteEmbeded(PSDevice pDevice, DWORD dwData);
67BOOL RFbSetPower ( 67BOOL RFbSetPower (
68 PSDevice pDevice, 68 PSDevice pDevice,
69 UINT uRATE, 69 unsigned int uRATE,
70 UINT uCH 70 unsigned int uCH
71 ); 71 );
72 72
73BOOL RFbRawSetPower( 73BOOL RFbRawSetPower(
74 PSDevice pDevice, 74 PSDevice pDevice,
75 BYTE byPwr, 75 BYTE byPwr,
76 UINT uRATE 76 unsigned int uRATE
77 ); 77 );
78 78
79void 79void
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index bfc786059ad1..6a4b87f09545 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -139,26 +139,24 @@ s_vGenerateTxParameter(
139 void *pvRrvTime, 139 void *pvRrvTime,
140 void *pvRTS, 140 void *pvRTS,
141 void *pvCTS, 141 void *pvCTS,
142 UINT cbFrameSize, 142 unsigned int cbFrameSize,
143 BOOL bNeedACK, 143 BOOL bNeedACK,
144 UINT uDMAIdx, 144 unsigned int uDMAIdx,
145 PSEthernetHeader psEthHeader 145 PSEthernetHeader psEthHeader
146 ); 146 );
147 147
148 148
149static 149static unsigned int s_uFillDataHead(
150UINT
151s_uFillDataHead (
152 PSDevice pDevice, 150 PSDevice pDevice,
153 BYTE byPktType, 151 BYTE byPktType,
154 WORD wCurrentRate, 152 WORD wCurrentRate,
155 void *pTxDataHead, 153 void *pTxDataHead,
156 UINT cbFrameLength, 154 unsigned int cbFrameLength,
157 UINT uDMAIdx, 155 unsigned int uDMAIdx,
158 BOOL bNeedAck, 156 BOOL bNeedAck,
159 UINT uFragIdx, 157 unsigned int uFragIdx,
160 UINT cbLastFragmentSize, 158 unsigned int cbLastFragmentSize,
161 UINT uMACfragNum, 159 unsigned int uMACfragNum,
162 BYTE byFBOption 160 BYTE byFBOption
163 ); 161 );
164 162
@@ -174,8 +172,8 @@ s_vGenerateMACHeader (
174 PSEthernetHeader psEthHeader, 172 PSEthernetHeader psEthHeader,
175 BOOL bNeedEncrypt, 173 BOOL bNeedEncrypt,
176 WORD wFragType, 174 WORD wFragType,
177 UINT uDMAIdx, 175 unsigned int uDMAIdx,
178 UINT uFragIdx 176 unsigned int uFragIdx
179 ); 177 );
180 178
181static 179static
@@ -199,24 +197,20 @@ s_vSWencryption (
199 WORD wPayloadSize 197 WORD wPayloadSize
200 ); 198 );
201 199
202static 200static unsigned int s_uGetTxRsvTime(
203UINT
204s_uGetTxRsvTime (
205 PSDevice pDevice, 201 PSDevice pDevice,
206 BYTE byPktType, 202 BYTE byPktType,
207 UINT cbFrameLength, 203 unsigned int cbFrameLength,
208 WORD wRate, 204 WORD wRate,
209 BOOL bNeedAck 205 BOOL bNeedAck
210 ); 206 );
211 207
212 208
213static 209static unsigned int s_uGetRTSCTSRsvTime(
214UINT
215s_uGetRTSCTSRsvTime (
216 PSDevice pDevice, 210 PSDevice pDevice,
217 BYTE byRTSRsvType, 211 BYTE byRTSRsvType,
218 BYTE byPktType, 212 BYTE byPktType,
219 UINT cbFrameLength, 213 unsigned int cbFrameLength,
220 WORD wCurrentRate 214 WORD wCurrentRate
221 ); 215 );
222 216
@@ -224,10 +218,10 @@ static
224void 218void
225s_vFillCTSHead ( 219s_vFillCTSHead (
226 PSDevice pDevice, 220 PSDevice pDevice,
227 UINT uDMAIdx, 221 unsigned int uDMAIdx,
228 BYTE byPktType, 222 BYTE byPktType,
229 void *pvCTS, 223 void *pvCTS,
230 UINT cbFrameLength, 224 unsigned int cbFrameLength,
231 BOOL bNeedAck, 225 BOOL bNeedAck,
232 BOOL bDisCRC, 226 BOOL bDisCRC,
233 WORD wCurrentRate, 227 WORD wCurrentRate,
@@ -240,7 +234,7 @@ s_vFillRTSHead(
240 PSDevice pDevice, 234 PSDevice pDevice,
241 BYTE byPktType, 235 BYTE byPktType,
242 void *pvRTS, 236 void *pvRTS,
243 UINT cbFrameLength, 237 unsigned int cbFrameLength,
244 BOOL bNeedAck, 238 BOOL bNeedAck,
245 BOOL bDisCRC, 239 BOOL bDisCRC,
246 PSEthernetHeader psEthHeader, 240 PSEthernetHeader psEthHeader,
@@ -248,28 +242,26 @@ s_vFillRTSHead(
248 BYTE byFBOption 242 BYTE byFBOption
249 ); 243 );
250 244
251static 245static unsigned int s_uGetDataDuration(
252UINT
253s_uGetDataDuration (
254 PSDevice pDevice, 246 PSDevice pDevice,
255 BYTE byDurType, 247 BYTE byDurType,
256 UINT cbFrameLength, 248 unsigned int cbFrameLength,
257 BYTE byPktType, 249 BYTE byPktType,
258 WORD wRate, 250 WORD wRate,
259 BOOL bNeedAck, 251 BOOL bNeedAck,
260 UINT uFragIdx, 252 unsigned int uFragIdx,
261 UINT cbLastFragmentSize, 253 unsigned int cbLastFragmentSize,
262 UINT uMACfragNum, 254 unsigned int uMACfragNum,
263 BYTE byFBOption 255 BYTE byFBOption
264 ); 256 );
265 257
266 258
267static 259static
268UINT 260unsigned int
269s_uGetRTSCTSDuration ( 261s_uGetRTSCTSDuration (
270 PSDevice pDevice, 262 PSDevice pDevice,
271 BYTE byDurType, 263 BYTE byDurType,
272 UINT cbFrameLength, 264 unsigned int cbFrameLength,
273 BYTE byPktType, 265 BYTE byPktType,
274 WORD wRate, 266 WORD wRate,
275 BOOL bNeedAck, 267 BOOL bNeedAck,
@@ -287,7 +279,7 @@ s_vGetFreeContext(
287{ 279{
288 PUSB_SEND_CONTEXT pContext = NULL; 280 PUSB_SEND_CONTEXT pContext = NULL;
289 PUSB_SEND_CONTEXT pReturnContext = NULL; 281 PUSB_SEND_CONTEXT pReturnContext = NULL;
290 UINT ii; 282 unsigned int ii;
291 283
292 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GetFreeContext()\n"); 284 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"GetFreeContext()\n");
293 285
@@ -456,7 +448,7 @@ s_vSWencryption (
456 WORD wPayloadSize 448 WORD wPayloadSize
457 ) 449 )
458{ 450{
459 UINT cbICVlen = 4; 451 unsigned int cbICVlen = 4;
460 DWORD dwICV = 0xFFFFFFFFL; 452 DWORD dwICV = 0xFFFFFFFFL;
461 PDWORD pdwICV; 453 PDWORD pdwICV;
462 454
@@ -497,16 +489,16 @@ s_vSWencryption (
497 PK_TYPE_11GA 3 489 PK_TYPE_11GA 3
498*/ 490*/
499static 491static
500UINT 492unsigned int
501s_uGetTxRsvTime ( 493s_uGetTxRsvTime (
502 PSDevice pDevice, 494 PSDevice pDevice,
503 BYTE byPktType, 495 BYTE byPktType,
504 UINT cbFrameLength, 496 unsigned int cbFrameLength,
505 WORD wRate, 497 WORD wRate,
506 BOOL bNeedAck 498 BOOL bNeedAck
507 ) 499 )
508{ 500{
509 UINT uDataTime, uAckTime; 501 unsigned int uDataTime, uAckTime;
510 502
511 uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate); 503 uDataTime = BBuGetFrameTime(pDevice->byPreambleType, byPktType, cbFrameLength, wRate);
512 if (byPktType == PK_TYPE_11B) {//llb,CCK mode 504 if (byPktType == PK_TYPE_11B) {//llb,CCK mode
@@ -525,16 +517,16 @@ s_uGetTxRsvTime (
525 517
526//byFreqType: 0=>5GHZ 1=>2.4GHZ 518//byFreqType: 0=>5GHZ 1=>2.4GHZ
527static 519static
528UINT 520unsigned int
529s_uGetRTSCTSRsvTime ( 521s_uGetRTSCTSRsvTime (
530 PSDevice pDevice, 522 PSDevice pDevice,
531 BYTE byRTSRsvType, 523 BYTE byRTSRsvType,
532 BYTE byPktType, 524 BYTE byPktType,
533 UINT cbFrameLength, 525 unsigned int cbFrameLength,
534 WORD wCurrentRate 526 WORD wCurrentRate
535 ) 527 )
536{ 528{
537 UINT uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime; 529 unsigned int uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime;
538 530
539 uRrvTime = uRTSTime = uCTSTime = uAckTime = uDataTime = 0; 531 uRrvTime = uRTSTime = uCTSTime = uAckTime = uDataTime = 0;
540 532
@@ -567,23 +559,22 @@ s_uGetRTSCTSRsvTime (
567 559
568//byFreqType 0: 5GHz, 1:2.4Ghz 560//byFreqType 0: 5GHz, 1:2.4Ghz
569static 561static
570UINT 562unsigned int
571s_uGetDataDuration ( 563s_uGetDataDuration (
572 PSDevice pDevice, 564 PSDevice pDevice,
573 BYTE byDurType, 565 BYTE byDurType,
574 UINT cbFrameLength, 566 unsigned int cbFrameLength,
575 BYTE byPktType, 567 BYTE byPktType,
576 WORD wRate, 568 WORD wRate,
577 BOOL bNeedAck, 569 BOOL bNeedAck,
578 UINT uFragIdx, 570 unsigned int uFragIdx,
579 UINT cbLastFragmentSize, 571 unsigned int cbLastFragmentSize,
580 UINT uMACfragNum, 572 unsigned int uMACfragNum,
581 BYTE byFBOption 573 BYTE byFBOption
582 ) 574 )
583{ 575{
584 BOOL bLastFrag = 0; 576 BOOL bLastFrag = 0;
585 UINT uAckTime =0, uNextPktTime = 0; 577 unsigned int uAckTime = 0, uNextPktTime = 0;
586
587 578
588 if (uFragIdx == (uMACfragNum-1)) { 579 if (uFragIdx == (uMACfragNum-1)) {
589 bLastFrag = 1; 580 bLastFrag = 1;
@@ -737,18 +728,18 @@ s_uGetDataDuration (
737 728
738//byFreqType: 0=>5GHZ 1=>2.4GHZ 729//byFreqType: 0=>5GHZ 1=>2.4GHZ
739static 730static
740UINT 731unsigned int
741s_uGetRTSCTSDuration ( 732s_uGetRTSCTSDuration (
742 PSDevice pDevice, 733 PSDevice pDevice,
743 BYTE byDurType, 734 BYTE byDurType,
744 UINT cbFrameLength, 735 unsigned int cbFrameLength,
745 BYTE byPktType, 736 BYTE byPktType,
746 WORD wRate, 737 WORD wRate,
747 BOOL bNeedAck, 738 BOOL bNeedAck,
748 BYTE byFBOption 739 BYTE byFBOption
749 ) 740 )
750{ 741{
751 UINT uCTSTime = 0, uDurTime = 0; 742 unsigned int uCTSTime = 0, uDurTime = 0;
752 743
753 744
754 switch (byDurType) { 745 switch (byDurType) {
@@ -836,18 +827,18 @@ s_uGetRTSCTSDuration (
836 827
837 828
838static 829static
839UINT 830unsigned int
840s_uFillDataHead ( 831s_uFillDataHead (
841 PSDevice pDevice, 832 PSDevice pDevice,
842 BYTE byPktType, 833 BYTE byPktType,
843 WORD wCurrentRate, 834 WORD wCurrentRate,
844 void *pTxDataHead, 835 void *pTxDataHead,
845 UINT cbFrameLength, 836 unsigned int cbFrameLength,
846 UINT uDMAIdx, 837 unsigned int uDMAIdx,
847 BOOL bNeedAck, 838 BOOL bNeedAck,
848 UINT uFragIdx, 839 unsigned int uFragIdx,
849 UINT cbLastFragmentSize, 840 unsigned int cbLastFragmentSize,
850 UINT uMACfragNum, 841 unsigned int uMACfragNum,
851 BYTE byFBOption 842 BYTE byFBOption
852 ) 843 )
853{ 844{
@@ -986,7 +977,7 @@ s_vFillRTSHead (
986 PSDevice pDevice, 977 PSDevice pDevice,
987 BYTE byPktType, 978 BYTE byPktType,
988 void *pvRTS, 979 void *pvRTS,
989 UINT cbFrameLength, 980 unsigned int cbFrameLength,
990 BOOL bNeedAck, 981 BOOL bNeedAck,
991 BOOL bDisCRC, 982 BOOL bDisCRC,
992 PSEthernetHeader psEthHeader, 983 PSEthernetHeader psEthHeader,
@@ -994,7 +985,7 @@ s_vFillRTSHead (
994 BYTE byFBOption 985 BYTE byFBOption
995 ) 986 )
996{ 987{
997 UINT uRTSFrameLen = 20; 988 unsigned int uRTSFrameLen = 20;
998 WORD wLen = 0x0000; 989 WORD wLen = 0x0000;
999 990
1000 if (pvRTS == NULL) 991 if (pvRTS == NULL)
@@ -1212,17 +1203,17 @@ static
1212void 1203void
1213s_vFillCTSHead ( 1204s_vFillCTSHead (
1214 PSDevice pDevice, 1205 PSDevice pDevice,
1215 UINT uDMAIdx, 1206 unsigned int uDMAIdx,
1216 BYTE byPktType, 1207 BYTE byPktType,
1217 void *pvCTS, 1208 void *pvCTS,
1218 UINT cbFrameLength, 1209 unsigned int cbFrameLength,
1219 BOOL bNeedAck, 1210 BOOL bNeedAck,
1220 BOOL bDisCRC, 1211 BOOL bDisCRC,
1221 WORD wCurrentRate, 1212 WORD wCurrentRate,
1222 BYTE byFBOption 1213 BYTE byFBOption
1223 ) 1214 )
1224{ 1215{
1225 UINT uCTSFrameLen = 14; 1216 unsigned int uCTSFrameLen = 14;
1226 WORD wLen = 0x0000; 1217 WORD wLen = 0x0000;
1227 1218
1228 if (pvCTS == NULL) { 1219 if (pvCTS == NULL) {
@@ -1307,7 +1298,7 @@ s_vFillCTSHead (
1307 * Return Value: none 1298 * Return Value: none
1308 * 1299 *
1309-*/ 1300-*/
1310// UINT cbFrameSize,//Hdr+Payload+FCS 1301
1311static 1302static
1312void 1303void
1313s_vGenerateTxParameter ( 1304s_vGenerateTxParameter (
@@ -1318,13 +1309,13 @@ s_vGenerateTxParameter (
1318 void *pvRrvTime, 1309 void *pvRrvTime,
1319 void *pvRTS, 1310 void *pvRTS,
1320 void *pvCTS, 1311 void *pvCTS,
1321 UINT cbFrameSize, 1312 unsigned int cbFrameSize,
1322 BOOL bNeedACK, 1313 BOOL bNeedACK,
1323 UINT uDMAIdx, 1314 unsigned int uDMAIdx,
1324 PSEthernetHeader psEthHeader 1315 PSEthernetHeader psEthHeader
1325 ) 1316 )
1326{ 1317{
1327 UINT cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 1318 unsigned int cbMACHdLen = WLAN_HDR_ADDR3_LEN; /* 24 */
1328 WORD wFifoCtl; 1319 WORD wFifoCtl;
1329 BOOL bDisCRC = FALSE; 1320 BOOL bDisCRC = FALSE;
1330 BYTE byFBOption = AUTO_FB_NONE; 1321 BYTE byFBOption = AUTO_FB_NONE;
@@ -1422,7 +1413,7 @@ s_vGenerateTxParameter (
1422/* 1413/*
1423 PBYTE pbyBuffer,//point to pTxBufHead 1414 PBYTE pbyBuffer,//point to pTxBufHead
1424 WORD wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last 1415 WORD wFragType,//00:Non-Frag, 01:Start, 02:Mid, 03:Last
1425 UINT cbFragmentSize,//Hdr+payoad+FCS 1416 unsigned int cbFragmentSize,//Hdr+payoad+FCS
1426*/ 1417*/
1427 1418
1428 1419
@@ -1432,29 +1423,30 @@ s_bPacketToWirelessUsb(
1432 BYTE byPktType, 1423 BYTE byPktType,
1433 PBYTE usbPacketBuf, 1424 PBYTE usbPacketBuf,
1434 BOOL bNeedEncryption, 1425 BOOL bNeedEncryption,
1435 UINT uSkbPacketLen, 1426 unsigned int uSkbPacketLen,
1436 UINT uDMAIdx, 1427 unsigned int uDMAIdx,
1437 PSEthernetHeader psEthHeader, 1428 PSEthernetHeader psEthHeader,
1438 PBYTE pPacket, 1429 PBYTE pPacket,
1439 PSKeyItem pTransmitKey, 1430 PSKeyItem pTransmitKey,
1440 UINT uNodeIndex, 1431 unsigned int uNodeIndex,
1441 WORD wCurrentRate, 1432 WORD wCurrentRate,
1442 UINT *pcbHeaderLen, 1433 unsigned int *pcbHeaderLen,
1443 UINT *pcbTotalLen 1434 unsigned int *pcbTotalLen
1444 ) 1435 )
1445{ 1436{
1446 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 1437 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
1447 UINT cbFrameSize,cbFrameBodySize; 1438 unsigned int cbFrameSize, cbFrameBodySize;
1448 PTX_BUFFER pTxBufHead; 1439 PTX_BUFFER pTxBufHead;
1449 UINT cb802_1_H_len; 1440 unsigned int cb802_1_H_len;
1450 UINT cbIVlen=0,cbICVlen=0,cbMIClen=0,cbMACHdLen=0,cbFCSlen=4; 1441 unsigned int cbIVlen = 0, cbICVlen = 0, cbMIClen = 0,
1451 UINT cbMICHDR = 0; 1442 cbMACHdLen = 0, cbFCSlen = 4;
1443 unsigned int cbMICHDR = 0;
1452 BOOL bNeedACK,bRTS; 1444 BOOL bNeedACK,bRTS;
1453 PBYTE pbyType,pbyMacHdr,pbyIVHead,pbyPayloadHead,pbyTxBufferAddr; 1445 PBYTE pbyType,pbyMacHdr,pbyIVHead,pbyPayloadHead,pbyTxBufferAddr;
1454 BYTE abySNAP_RFC1042[6] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00}; 1446 BYTE abySNAP_RFC1042[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0x00};
1455 BYTE abySNAP_Bridgetunnel[6] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8}; 1447 BYTE abySNAP_Bridgetunnel[ETH_ALEN] = {0xAA, 0xAA, 0x03, 0x00, 0x00, 0xF8};
1456 UINT uDuration; 1448 unsigned int uDuration;
1457 UINT cbHeaderLength= 0,uPadding = 0; 1449 unsigned int cbHeaderLength = 0, uPadding = 0;
1458 void *pvRrvTime; 1450 void *pvRrvTime;
1459 PSMICHDRHead pMICHDR; 1451 PSMICHDRHead pMICHDR;
1460 void *pvRTS; 1452 void *pvRTS;
@@ -1809,7 +1801,7 @@ s_bPacketToWirelessUsb(
1809 } 1801 }
1810 1802
1811 if (pDevice->bSoftwareGenCrcErr == TRUE) { 1803 if (pDevice->bSoftwareGenCrcErr == TRUE) {
1812 UINT cbLen; 1804 unsigned int cbLen;
1813 PDWORD pdwCRC; 1805 PDWORD pdwCRC;
1814 1806
1815 dwCRC = 0xFFFFFFFFL; 1807 dwCRC = 0xFFFFFFFFL;
@@ -1865,8 +1857,8 @@ s_vGenerateMACHeader (
1865 PSEthernetHeader psEthHeader, 1857 PSEthernetHeader psEthHeader,
1866 BOOL bNeedEncrypt, 1858 BOOL bNeedEncrypt,
1867 WORD wFragType, 1859 WORD wFragType,
1868 UINT uDMAIdx, 1860 unsigned int uDMAIdx,
1869 UINT uFragIdx 1861 unsigned int uFragIdx
1870 ) 1862 )
1871{ 1863{
1872 PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr; 1864 PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr;
@@ -1968,22 +1960,22 @@ CMD_STATUS csMgmt_xmit(
1968 void *pvRTS; 1960 void *pvRTS;
1969 PSCTS pCTS; 1961 PSCTS pCTS;
1970 void *pvTxDataHd; 1962 void *pvTxDataHd;
1971 UINT uDuration; 1963 unsigned int uDuration;
1972 UINT cbReqCount; 1964 unsigned int cbReqCount;
1973 PS802_11Header pMACHeader; 1965 PS802_11Header pMACHeader;
1974 UINT cbHeaderSize; 1966 unsigned int cbHeaderSize;
1975 UINT cbFrameBodySize; 1967 unsigned int cbFrameBodySize;
1976 BOOL bNeedACK; 1968 BOOL bNeedACK;
1977 BOOL bIsPSPOLL = FALSE; 1969 BOOL bIsPSPOLL = FALSE;
1978 PSTxBufHead pTxBufHead; 1970 PSTxBufHead pTxBufHead;
1979 UINT cbFrameSize; 1971 unsigned int cbFrameSize;
1980 UINT cbIVlen = 0; 1972 unsigned int cbIVlen = 0;
1981 UINT cbICVlen = 0; 1973 unsigned int cbICVlen = 0;
1982 UINT cbMIClen = 0; 1974 unsigned int cbMIClen = 0;
1983 UINT cbFCSlen = 4; 1975 unsigned int cbFCSlen = 4;
1984 UINT uPadding = 0; 1976 unsigned int uPadding = 0;
1985 WORD wTxBufSize; 1977 WORD wTxBufSize;
1986 UINT cbMacHdLen; 1978 unsigned int cbMacHdLen;
1987 SEthernetHeader sEthHeader; 1979 SEthernetHeader sEthHeader;
1988 void *pvRrvTime; 1980 void *pvRrvTime;
1989 void *pMICHDR; 1981 void *pMICHDR;
@@ -2258,15 +2250,15 @@ csBeacon_xmit(
2258 ) 2250 )
2259{ 2251{
2260 2252
2261 UINT cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN; 2253 unsigned int cbFrameSize = pPacket->cbMPDULen + WLAN_FCS_LEN;
2262 UINT cbHeaderSize = 0; 2254 unsigned int cbHeaderSize = 0;
2263 WORD wTxBufSize = sizeof(STxShortBufHead); 2255 WORD wTxBufSize = sizeof(STxShortBufHead);
2264 PSTxShortBufHead pTxBufHead; 2256 PSTxShortBufHead pTxBufHead;
2265 PS802_11Header pMACHeader; 2257 PS802_11Header pMACHeader;
2266 PSTxDataHead_ab pTxDataHead; 2258 PSTxDataHead_ab pTxDataHead;
2267 WORD wCurrentRate; 2259 WORD wCurrentRate;
2268 UINT cbFrameBodySize; 2260 unsigned int cbFrameBodySize;
2269 UINT cbReqCount; 2261 unsigned int cbReqCount;
2270 PBEACON_BUFFER pTX_Buffer; 2262 PBEACON_BUFFER pTX_Buffer;
2271 PBYTE pbyTxBufferAddr; 2263 PBYTE pbyTxBufferAddr;
2272 PUSB_SEND_CONTEXT pContext; 2264 PUSB_SEND_CONTEXT pContext;
@@ -2353,41 +2345,41 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
2353 void *pvRTS; 2345 void *pvRTS;
2354 void *pvCTS; 2346 void *pvCTS;
2355 void *pvTxDataHd; 2347 void *pvTxDataHd;
2356 UINT uDuration; 2348 unsigned int uDuration;
2357 UINT cbReqCount; 2349 unsigned int cbReqCount;
2358 PS802_11Header pMACHeader; 2350 PS802_11Header pMACHeader;
2359 UINT cbHeaderSize; 2351 unsigned int cbHeaderSize;
2360 UINT cbFrameBodySize; 2352 unsigned int cbFrameBodySize;
2361 BOOL bNeedACK; 2353 BOOL bNeedACK;
2362 BOOL bIsPSPOLL = FALSE; 2354 BOOL bIsPSPOLL = FALSE;
2363 PSTxBufHead pTxBufHead; 2355 PSTxBufHead pTxBufHead;
2364 UINT cbFrameSize; 2356 unsigned int cbFrameSize;
2365 UINT cbIVlen = 0; 2357 unsigned int cbIVlen = 0;
2366 UINT cbICVlen = 0; 2358 unsigned int cbICVlen = 0;
2367 UINT cbMIClen = 0; 2359 unsigned int cbMIClen = 0;
2368 UINT cbFCSlen = 4; 2360 unsigned int cbFCSlen = 4;
2369 UINT uPadding = 0; 2361 unsigned int uPadding = 0;
2370 UINT cbMICHDR = 0; 2362 unsigned int cbMICHDR = 0;
2371 UINT uLength = 0; 2363 unsigned int uLength = 0;
2372 DWORD dwMICKey0, dwMICKey1; 2364 DWORD dwMICKey0, dwMICKey1;
2373 DWORD dwMIC_Priority; 2365 DWORD dwMIC_Priority;
2374 PDWORD pdwMIC_L; 2366 PDWORD pdwMIC_L;
2375 PDWORD pdwMIC_R; 2367 PDWORD pdwMIC_R;
2376 WORD wTxBufSize; 2368 WORD wTxBufSize;
2377 UINT cbMacHdLen; 2369 unsigned int cbMacHdLen;
2378 SEthernetHeader sEthHeader; 2370 SEthernetHeader sEthHeader;
2379 void *pvRrvTime; 2371 void *pvRrvTime;
2380 void *pMICHDR; 2372 void *pMICHDR;
2381 WORD wCurrentRate = RATE_1M; 2373 WORD wCurrentRate = RATE_1M;
2382 PUWLAN_80211HDR p80211Header; 2374 PUWLAN_80211HDR p80211Header;
2383 UINT uNodeIndex = 0; 2375 unsigned int uNodeIndex = 0;
2384 BOOL bNodeExist = FALSE; 2376 BOOL bNodeExist = FALSE;
2385 SKeyItem STempKey; 2377 SKeyItem STempKey;
2386 PSKeyItem pTransmitKey = NULL; 2378 PSKeyItem pTransmitKey = NULL;
2387 PBYTE pbyIVHead; 2379 PBYTE pbyIVHead;
2388 PBYTE pbyPayloadHead; 2380 PBYTE pbyPayloadHead;
2389 PBYTE pbyMacHdr; 2381 PBYTE pbyMacHdr;
2390 UINT cbExtSuppRate = 0; 2382 unsigned int cbExtSuppRate = 0;
2391 PTX_BUFFER pTX_Buffer; 2383 PTX_BUFFER pTX_Buffer;
2392 PUSB_SEND_CONTEXT pContext; 2384 PUSB_SEND_CONTEXT pContext;
2393// PWLAN_IE pItem; 2385// PWLAN_IE pItem;
@@ -2754,20 +2746,20 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
2754NTSTATUS 2746NTSTATUS
2755nsDMA_tx_packet( 2747nsDMA_tx_packet(
2756 PSDevice pDevice, 2748 PSDevice pDevice,
2757 UINT uDMAIdx, 2749 unsigned int uDMAIdx,
2758 struct sk_buff *skb 2750 struct sk_buff *skb
2759 ) 2751 )
2760{ 2752{
2761 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 2753 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
2762 UINT BytesToWrite =0,uHeaderLen = 0; 2754 unsigned int BytesToWrite = 0, uHeaderLen = 0;
2763 UINT uNodeIndex = 0; 2755 unsigned int uNodeIndex = 0;
2764 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; 2756 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
2765 WORD wAID; 2757 WORD wAID;
2766 BYTE byPktType; 2758 BYTE byPktType;
2767 BOOL bNeedEncryption = FALSE; 2759 BOOL bNeedEncryption = FALSE;
2768 PSKeyItem pTransmitKey = NULL; 2760 PSKeyItem pTransmitKey = NULL;
2769 SKeyItem STempKey; 2761 SKeyItem STempKey;
2770 UINT ii; 2762 unsigned int ii;
2771 BOOL bTKIP_UseGTK = FALSE; 2763 BOOL bTKIP_UseGTK = FALSE;
2772 BOOL bNeedDeAuth = FALSE; 2764 BOOL bNeedDeAuth = FALSE;
2773 PBYTE pbyBSSID; 2765 PBYTE pbyBSSID;
@@ -2775,7 +2767,7 @@ nsDMA_tx_packet(
2775 PUSB_SEND_CONTEXT pContext; 2767 PUSB_SEND_CONTEXT pContext;
2776 BOOL fConvertedPacket; 2768 BOOL fConvertedPacket;
2777 PTX_BUFFER pTX_Buffer; 2769 PTX_BUFFER pTX_Buffer;
2778 UINT status; 2770 unsigned int status;
2779 WORD wKeepRate = pDevice->wCurrentRate; 2771 WORD wKeepRate = pDevice->wCurrentRate;
2780 struct net_device_stats* pStats = &pDevice->stats; 2772 struct net_device_stats* pStats = &pDevice->stats;
2781//#ifdef WPA_SM_Transtatus 2773//#ifdef WPA_SM_Transtatus
@@ -3177,12 +3169,12 @@ BOOL
3177bRelayPacketSend ( 3169bRelayPacketSend (
3178 PSDevice pDevice, 3170 PSDevice pDevice,
3179 PBYTE pbySkbData, 3171 PBYTE pbySkbData,
3180 UINT uDataLen, 3172 unsigned int uDataLen,
3181 UINT uNodeIndex 3173 unsigned int uNodeIndex
3182 ) 3174 )
3183{ 3175{
3184 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 3176 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
3185 UINT BytesToWrite =0,uHeaderLen = 0; 3177 unsigned int BytesToWrite = 0, uHeaderLen = 0;
3186 BYTE byPktType = PK_TYPE_11B; 3178 BYTE byPktType = PK_TYPE_11B;
3187 BOOL bNeedEncryption = FALSE; 3179 BOOL bNeedEncryption = FALSE;
3188 SKeyItem STempKey; 3180 SKeyItem STempKey;
@@ -3192,7 +3184,7 @@ bRelayPacketSend (
3192 BYTE byPktTyp; 3184 BYTE byPktTyp;
3193 BOOL fConvertedPacket; 3185 BOOL fConvertedPacket;
3194 PTX_BUFFER pTX_Buffer; 3186 PTX_BUFFER pTX_Buffer;
3195 UINT status; 3187 unsigned int status;
3196 WORD wKeepRate = pDevice->wCurrentRate; 3188 WORD wKeepRate = pDevice->wCurrentRate;
3197 3189
3198 3190
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 64df4a3550d6..f90de42d7abe 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -671,21 +671,24 @@ bPacketToWirelessUsb(
671 BYTE byPktType, 671 BYTE byPktType,
672 PBYTE usbPacketBuf, 672 PBYTE usbPacketBuf,
673 BOOL bNeedEncrypt, 673 BOOL bNeedEncrypt,
674 UINT cbPayloadSize, 674 unsigned int cbPayloadSize,
675 UINT uDMAIdx, 675 unsigned int uDMAIdx,
676 PSEthernetHeader psEthHeader, 676 PSEthernetHeader psEthHeader,
677 PBYTE pPacket, 677 PBYTE pPacket,
678 PSKeyItem pTransmitKey, 678 PSKeyItem pTransmitKey,
679 UINT uNodeIndex, 679 unsigned int uNodeIndex,
680 WORD wCurrentRate, 680 WORD wCurrentRate,
681 UINT *pcbHeaderLen, 681 unsigned int *pcbHeaderLen,
682 UINT *pcbTotalLen 682 unsigned int *pcbTotalLen
683 ); 683 );
684 684
685void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb); 685void vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb);
686NTSTATUS nsDMA_tx_packet(PSDevice pDevice, UINT uDMAIdx, struct sk_buff *skb); 686NTSTATUS nsDMA_tx_packet(PSDevice pDevice,
687 unsigned int uDMAIdx,
688 struct sk_buff *skb);
687CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); 689CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
688CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket); 690CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket);
689BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData, UINT uDataLen, UINT uNodeIndex); 691BOOL bRelayPacketSend(PSDevice pDevice, PBYTE pbySkbData,
692 unsigned int uDataLen, unsigned int uNodeIndex);
690 693
691#endif /* __RXTX_H__ */ 694#endif /* __RXTX_H__ */
diff --git a/drivers/staging/vt6656/tcrc.c b/drivers/staging/vt6656/tcrc.c
index 3464801ede57..e25021e850a0 100644
--- a/drivers/staging/vt6656/tcrc.c
+++ b/drivers/staging/vt6656/tcrc.c
@@ -132,7 +132,7 @@ static const DWORD s_adwCrc32Table[256] = {
132 * Return Value: CRC-32 132 * Return Value: CRC-32
133 * 133 *
134-*/ 134-*/
135DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed) 135DWORD CRCdwCrc32(PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed)
136{ 136{
137 DWORD dwCrc; 137 DWORD dwCrc;
138 138
@@ -165,7 +165,7 @@ DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed)
165 * Return Value: CRC-32 165 * Return Value: CRC-32
166 * 166 *
167-*/ 167-*/
168DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte) 168DWORD CRCdwGetCrc32(PBYTE pbyData, unsigned int cbByte)
169{ 169{
170 return ~CRCdwCrc32(pbyData, cbByte, 0xFFFFFFFFL); 170 return ~CRCdwCrc32(pbyData, cbByte, 0xFFFFFFFFL);
171} 171}
@@ -191,7 +191,7 @@ DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte)
191 * Return Value: CRC-32 191 * Return Value: CRC-32
192 * 192 *
193-*/ 193-*/
194DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC) 194DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC)
195{ 195{
196 return CRCdwCrc32(pbyData, cbByte, dwPreCRC); 196 return CRCdwCrc32(pbyData, cbByte, dwPreCRC);
197} 197}
diff --git a/drivers/staging/vt6656/tcrc.h b/drivers/staging/vt6656/tcrc.h
index a41fc9b56105..4dfd01e477a4 100644
--- a/drivers/staging/vt6656/tcrc.h
+++ b/drivers/staging/vt6656/tcrc.h
@@ -43,8 +43,8 @@
43 43
44/*--------------------- Export Functions --------------------------*/ 44/*--------------------- Export Functions --------------------------*/
45 45
46DWORD CRCdwCrc32(PBYTE pbyData, UINT cbByte, DWORD dwCrcSeed); 46DWORD CRCdwCrc32(PBYTE pbyData, unsigned int cbByte, DWORD dwCrcSeed);
47DWORD CRCdwGetCrc32(PBYTE pbyData, UINT cbByte); 47DWORD CRCdwGetCrc32(PBYTE pbyData, unsigned int cbByte);
48DWORD CRCdwGetCrc32Ex(PBYTE pbyData, UINT cbByte, DWORD dwPreCRC); 48DWORD CRCdwGetCrc32Ex(PBYTE pbyData, unsigned int cbByte, DWORD dwPreCRC);
49 49
50#endif /* __TCRC_H__ */ 50#endif /* __TCRC_H__ */
diff --git a/drivers/staging/vt6656/tether.c b/drivers/staging/vt6656/tether.c
index a7c716f174da..4f368f174b21 100644
--- a/drivers/staging/vt6656/tether.c
+++ b/drivers/staging/vt6656/tether.c
@@ -96,7 +96,7 @@ BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr)
96 * Return Value: TRUE if ok; FALSE if error. 96 * Return Value: TRUE if ok; FALSE if error.
97 * 97 *
98 */ 98 */
99BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength) 99BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, unsigned int cbFrameLength)
100{ 100{
101 DWORD dwCRC; 101 DWORD dwCRC;
102 102
diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h
index 9b26033c585b..f5819a7aee27 100644
--- a/drivers/staging/vt6656/tether.h
+++ b/drivers/staging/vt6656/tether.h
@@ -228,6 +228,6 @@ S802_11Header, *PS802_11Header;
228 228
229BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); 229BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr);
230//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); 230//BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr);
231BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength); 231BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, unsigned int cbFrameLength);
232 232
233#endif /* __TETHER_H__ */ 233#endif /* __TETHER_H__ */
diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h
index 3a297754233a..c27f9858e2e9 100644
--- a/drivers/staging/vt6656/ttype.h
+++ b/drivers/staging/vt6656/ttype.h
@@ -72,12 +72,6 @@ typedef int BOOL;
72 72
73/****** Simple typedefs ***************************************************/ 73/****** Simple typedefs ***************************************************/
74 74
75typedef unsigned char UCHAR;
76typedef unsigned short USHORT;
77typedef unsigned int UINT;
78typedef unsigned long ULONG;
79typedef unsigned long long ULONGLONG; //64 bit
80
81typedef unsigned char BYTE; // 8-bit 75typedef unsigned char BYTE; // 8-bit
82typedef unsigned short WORD; // 16-bit 76typedef unsigned short WORD; // 16-bit
83typedef unsigned long DWORD; // 32-bit 77typedef unsigned long DWORD; // 32-bit
diff --git a/drivers/staging/vt6656/upc.h b/drivers/staging/vt6656/upc.h
index be386edb3e94..b33aba4b12c9 100644
--- a/drivers/staging/vt6656/upc.h
+++ b/drivers/staging/vt6656/upc.h
@@ -141,7 +141,7 @@
141 141
142#define PCAvDelayByIO(uDelayUnit) { \ 142#define PCAvDelayByIO(uDelayUnit) { \
143 BYTE byData; \ 143 BYTE byData; \
144 ULONG ii; \ 144 unsigned long ii; \
145 \ 145 \
146 if (uDelayUnit <= 50) { \ 146 if (uDelayUnit <= 50) { \
147 udelay(uDelayUnit); \ 147 udelay(uDelayUnit); \
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index ce71f18afd81..fd2355e34fb0 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -484,12 +484,11 @@ s_nsInterruptUsbIoCompleteRead(
484 pDevice->fKillEventPollingThread = TRUE; 484 pDevice->fKillEventPollingThread = TRUE;
485// } 485// }
486 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"IntUSBIoCompleteControl STATUS = %d\n", ntStatus ); 486 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"IntUSBIoCompleteControl STATUS = %d\n", ntStatus );
487 } 487 } else {
488 else { 488 pDevice->ulIntInBytesRead += (unsigned long) urb->actual_length;
489 pDevice->ulIntInBytesRead += (ULONG)urb->actual_length; 489 pDevice->ulIntInContCRCError = 0;
490 pDevice->ulIntInContCRCError = 0; 490 pDevice->bEventAvailable = TRUE;
491 pDevice->bEventAvailable = TRUE; 491 INTnsProcessData(pDevice);
492 INTnsProcessData(pDevice);
493 } 492 }
494 493
495 STAvUpdateUSBCounter(&pDevice->scStatistic.USB_InterruptStat, ntStatus); 494 STAvUpdateUSBCounter(&pDevice->scStatistic.USB_InterruptStat, ntStatus);
@@ -614,7 +613,7 @@ s_nsBulkInUsbIoCompleteRead(
614{ 613{
615 PRCB pRCB = (PRCB)urb->context; 614 PRCB pRCB = (PRCB)urb->context;
616 PSDevice pDevice = (PSDevice)pRCB->pDevice; 615 PSDevice pDevice = (PSDevice)pRCB->pDevice;
617 ULONG bytesRead; 616 unsigned long bytesRead;
618 BOOL bIndicateReceive = FALSE; 617 BOOL bIndicateReceive = FALSE;
619 BOOL bReAllocSkb = FALSE; 618 BOOL bReAllocSkb = FALSE;
620 NTSTATUS status; 619 NTSTATUS status;
@@ -774,7 +773,7 @@ s_nsBulkOutIoCompleteWrite(
774 PSDevice pDevice; 773 PSDevice pDevice;
775 NTSTATUS status; 774 NTSTATUS status;
776 CONTEXT_TYPE ContextType; 775 CONTEXT_TYPE ContextType;
777 ULONG ulBufLen; 776 unsigned long ulBufLen;
778 PUSB_SEND_CONTEXT pContext; 777 PUSB_SEND_CONTEXT pContext;
779 778
780 779
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 6fec9094ccd0..72e21b6f0e88 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -219,7 +219,7 @@ s_vProbeChannel(
219 PBYTE pbyRate; 219 PBYTE pbyRate;
220 PSTxMgmtPacket pTxPacket; 220 PSTxMgmtPacket pTxPacket;
221 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 221 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
222 UINT ii; 222 unsigned int ii;
223 223
224 224
225 if (pDevice->byBBType == BB_TYPE_11A) { 225 if (pDevice->byBBType == BB_TYPE_11A) {
@@ -316,15 +316,15 @@ s_MgrMakeProbeRequest(
316 return pTxPacket; 316 return pTxPacket;
317} 317}
318 318
319void vCommandTimerWait(void *hDeviceContext, UINT MSecond) 319void vCommandTimerWait(void *hDeviceContext, unsigned int MSecond)
320{ 320{
321 PSDevice pDevice = (PSDevice)hDeviceContext; 321 PSDevice pDevice = (PSDevice)hDeviceContext;
322 322
323 init_timer(&pDevice->sTimerCommand); 323 init_timer(&pDevice->sTimerCommand);
324 pDevice->sTimerCommand.data = (ULONG)pDevice; 324 pDevice->sTimerCommand.data = (unsigned long)pDevice;
325 pDevice->sTimerCommand.function = (TimerFunction)vRunCommand; 325 pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
326 // RUN_AT :1 msec ~= (HZ/1024) 326 // RUN_AT :1 msec ~= (HZ/1024)
327 pDevice->sTimerCommand.expires = (UINT)RUN_AT((MSecond * HZ) >> 10); 327 pDevice->sTimerCommand.expires = (unsigned int)RUN_AT((MSecond * HZ) >> 10);
328 add_timer(&pDevice->sTimerCommand); 328 add_timer(&pDevice->sTimerCommand);
329 return; 329 return;
330} 330}
@@ -336,7 +336,7 @@ void vRunCommand(void *hDeviceContext)
336 PWLAN_IE_SSID pItemSSID; 336 PWLAN_IE_SSID pItemSSID;
337 PWLAN_IE_SSID pItemSSIDCurr; 337 PWLAN_IE_SSID pItemSSIDCurr;
338 CMD_STATUS Status; 338 CMD_STATUS Status;
339 UINT ii; 339 unsigned int ii;
340 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; 340 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
341 struct sk_buff *skb; 341 struct sk_buff *skb;
342 BYTE byData; 342 BYTE byData;
@@ -760,7 +760,7 @@ void vRunCommand(void *hDeviceContext)
760 // printk("Re-initial TxDataTimer****\n"); 760 // printk("Re-initial TxDataTimer****\n");
761 del_timer(&pDevice->sTimerTxData); 761 del_timer(&pDevice->sTimerTxData);
762 init_timer(&pDevice->sTimerTxData); 762 init_timer(&pDevice->sTimerTxData);
763 pDevice->sTimerTxData.data = (ULONG)pDevice; 763 pDevice->sTimerTxData.data = (unsigned long) pDevice;
764 pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData; 764 pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData;
765 pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback 765 pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback
766 pDevice->fTxDataInSleep = FALSE; 766 pDevice->fTxDataInSleep = FALSE;
@@ -1264,8 +1264,8 @@ BOOL bScheduleCommand(void *hDeviceContext,
1264static BOOL s_bClearBSSID_SCAN(void *hDeviceContext) 1264static BOOL s_bClearBSSID_SCAN(void *hDeviceContext)
1265{ 1265{
1266 PSDevice pDevice = (PSDevice)hDeviceContext; 1266 PSDevice pDevice = (PSDevice)hDeviceContext;
1267 UINT uCmdDequeueIdx = pDevice->uCmdDequeueIdx; 1267 unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx;
1268 UINT ii; 1268 unsigned int ii;
1269 1269
1270 if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx != pDevice->uCmdEnqueueIdx)) { 1270 if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx != pDevice->uCmdEnqueueIdx)) {
1271 for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue); ii ++) { 1271 for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue); ii ++) {
@@ -1289,7 +1289,7 @@ void vResetCommandTimer(void *hDeviceContext)
1289 del_timer(&pDevice->sTimerCommand); 1289 del_timer(&pDevice->sTimerCommand);
1290 //init timer 1290 //init timer
1291 init_timer(&pDevice->sTimerCommand); 1291 init_timer(&pDevice->sTimerCommand);
1292 pDevice->sTimerCommand.data = (ULONG)pDevice; 1292 pDevice->sTimerCommand.data = (unsigned long)pDevice;
1293 pDevice->sTimerCommand.function = (TimerFunction)vRunCommand; 1293 pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
1294 pDevice->sTimerCommand.expires = RUN_AT(HZ); 1294 pDevice->sTimerCommand.expires = RUN_AT(HZ);
1295 pDevice->cbFreeCmdQueue = CMD_Q_SIZE; 1295 pDevice->cbFreeCmdQueue = CMD_Q_SIZE;
diff --git a/drivers/staging/vt6656/wctl.c b/drivers/staging/vt6656/wctl.c
index 956add694227..857ce0bc00a4 100644
--- a/drivers/staging/vt6656/wctl.c
+++ b/drivers/staging/vt6656/wctl.c
@@ -69,8 +69,8 @@
69 69
70BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) 70BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader)
71{ 71{
72 UINT uIndex; 72 unsigned int uIndex;
73 UINT ii; 73 unsigned int ii;
74 PSCacheEntry pCacheEntry; 74 PSCacheEntry pCacheEntry;
75 75
76 if (IS_FC_RETRY(pMACHeader)) { 76 if (IS_FC_RETRY(pMACHeader)) {
@@ -111,9 +111,9 @@ BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader)
111 * Return Value: index number in Defragment Database 111 * Return Value: index number in Defragment Database
112 * 112 *
113 */ 113 */
114UINT WCTLuSearchDFCB (PSDevice pDevice, PS802_11Header pMACHeader) 114unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
115{ 115{
116UINT ii; 116 unsigned int ii;
117 117
118 for(ii=0;ii<pDevice->cbDFCB;ii++) { 118 for(ii=0;ii<pDevice->cbDFCB;ii++) {
119 if ((pDevice->sRxDFCB[ii].bInUse == TRUE) && 119 if ((pDevice->sRxDFCB[ii].bInUse == TRUE) &&
@@ -141,9 +141,9 @@ UINT ii;
141 * Return Value: index number in Defragment Database 141 * Return Value: index number in Defragment Database
142 * 142 *
143 */ 143 */
144UINT WCTLuInsertDFCB (PSDevice pDevice, PS802_11Header pMACHeader) 144unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader)
145{ 145{
146UINT ii; 146 unsigned int ii;
147 147
148 if (pDevice->cbFreeDFCB == 0) 148 if (pDevice->cbFreeDFCB == 0)
149 return(pDevice->cbDFCB); 149 return(pDevice->cbDFCB);
@@ -180,9 +180,10 @@ UINT ii;
180 * Return Value: TRUE if it is valid fragment packet and we have resource to defragment; otherwise FALSE 180 * Return Value: TRUE if it is valid fragment packet and we have resource to defragment; otherwise FALSE
181 * 181 *
182 */ 182 */
183BOOL WCTLbHandleFragment (PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV) 183BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader,
184 unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV)
184{ 185{
185UINT uHeaderSize; 186unsigned int uHeaderSize;
186 187
187 188
188 if (bWEP == TRUE) { 189 if (bWEP == TRUE) {
diff --git a/drivers/staging/vt6656/wctl.h b/drivers/staging/vt6656/wctl.h
index c81dff700e0f..7270af68c89d 100644
--- a/drivers/staging/vt6656/wctl.h
+++ b/drivers/staging/vt6656/wctl.h
@@ -90,7 +90,6 @@
90 (uVar)++; \ 90 (uVar)++; \
91} 91}
92 92
93
94/*--------------------- Export Classes ----------------------------*/ 93/*--------------------- Export Classes ----------------------------*/
95 94
96/*--------------------- Export Variables --------------------------*/ 95/*--------------------- Export Variables --------------------------*/
@@ -98,8 +97,9 @@
98/*--------------------- Export Functions --------------------------*/ 97/*--------------------- Export Functions --------------------------*/
99 98
100BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader); 99BOOL WCTLbIsDuplicate(PSCache pCache, PS802_11Header pMACHeader);
101BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader, UINT cbFrameLength, BOOL bWEP, BOOL bExtIV); 100BOOL WCTLbHandleFragment(PSDevice pDevice, PS802_11Header pMACHeader,
102UINT WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader); 101 unsigned int cbFrameLength, BOOL bWEP, BOOL bExtIV);
103UINT WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader); 102unsigned int WCTLuSearchDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
103unsigned int WCTLuInsertDFCB(PSDevice pDevice, PS802_11Header pMACHeader);
104 104
105#endif /* __WCTL_H__ */ 105#endif /* __WCTL_H__ */
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index aaba5221170d..93c15f0580fe 100644
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -118,7 +118,7 @@ s_vMgrRxAssocRequest(
118 PSDevice pDevice, 118 PSDevice pDevice,
119 PSMgmtObject pMgmt, 119 PSMgmtObject pMgmt,
120 PSRxMgmtPacket pRxPacket, 120 PSRxMgmtPacket pRxPacket,
121 UINT uNodeIndex 121 unsigned int uNodeIndex
122 ); 122 );
123 123
124static 124static
@@ -242,7 +242,7 @@ s_MgrMakeBeacon(
242 PSMgmtObject pMgmt, 242 PSMgmtObject pMgmt,
243 WORD wCurrCapInfo, 243 WORD wCurrCapInfo,
244 WORD wCurrBeaconPeriod, 244 WORD wCurrBeaconPeriod,
245 UINT uCurrChannel, 245 unsigned int uCurrChannel,
246 WORD wCurrATIMWinodw, 246 WORD wCurrATIMWinodw,
247 PWLAN_IE_SSID pCurrSSID, 247 PWLAN_IE_SSID pCurrSSID,
248 PBYTE pCurrBSSID, 248 PBYTE pCurrBSSID,
@@ -287,7 +287,7 @@ s_MgrMakeProbeResponse(
287 PSMgmtObject pMgmt, 287 PSMgmtObject pMgmt,
288 WORD wCurrCapInfo, 288 WORD wCurrCapInfo,
289 WORD wCurrBeaconPeriod, 289 WORD wCurrBeaconPeriod,
290 UINT uCurrChannel, 290 unsigned int uCurrChannel,
291 WORD wCurrATIMWinodw, 291 WORD wCurrATIMWinodw,
292 PBYTE pDstAddr, 292 PBYTE pDstAddr,
293 PWLAN_IE_SSID pCurrSSID, 293 PWLAN_IE_SSID pCurrSSID,
@@ -310,7 +310,7 @@ static
310void 310void
311s_vMgrSynchBSS ( 311s_vMgrSynchBSS (
312 PSDevice pDevice, 312 PSDevice pDevice,
313 UINT uBSSMode, 313 unsigned int uBSSMode,
314 PKnownBSS pCurr, 314 PKnownBSS pCurr,
315 PCMD_STATUS pStatus 315 PCMD_STATUS pStatus
316 ); 316 );
@@ -364,19 +364,19 @@ void vMgrObjectInit(void *hDeviceContext)
364 BSSvClearBSSList((void *) pDevice, FALSE); 364 BSSvClearBSSList((void *) pDevice, FALSE);
365 365
366 init_timer(&pMgmt->sTimerSecondCallback); 366 init_timer(&pMgmt->sTimerSecondCallback);
367 pMgmt->sTimerSecondCallback.data = (ULONG)pDevice; 367 pMgmt->sTimerSecondCallback.data = (unsigned long)pDevice;
368 pMgmt->sTimerSecondCallback.function = (TimerFunction)BSSvSecondCallBack; 368 pMgmt->sTimerSecondCallback.function = (TimerFunction)BSSvSecondCallBack;
369 pMgmt->sTimerSecondCallback.expires = RUN_AT(HZ); 369 pMgmt->sTimerSecondCallback.expires = RUN_AT(HZ);
370 370
371 init_timer(&pDevice->sTimerCommand); 371 init_timer(&pDevice->sTimerCommand);
372 pDevice->sTimerCommand.data = (ULONG)pDevice; 372 pDevice->sTimerCommand.data = (unsigned long)pDevice;
373 pDevice->sTimerCommand.function = (TimerFunction)vRunCommand; 373 pDevice->sTimerCommand.function = (TimerFunction)vRunCommand;
374 pDevice->sTimerCommand.expires = RUN_AT(HZ); 374 pDevice->sTimerCommand.expires = RUN_AT(HZ);
375 375
376//2007-0115-10<Add>by MikeLiu 376//2007-0115-10<Add>by MikeLiu
377 #ifdef TxInSleep 377 #ifdef TxInSleep
378 init_timer(&pDevice->sTimerTxData); 378 init_timer(&pDevice->sTimerTxData);
379 pDevice->sTimerTxData.data = (ULONG)pDevice; 379 pDevice->sTimerTxData.data = (unsigned long)pDevice;
380 pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData; 380 pDevice->sTimerTxData.function = (TimerFunction)BSSvSecondTxData;
381 pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback 381 pDevice->sTimerTxData.expires = RUN_AT(10*HZ); //10s callback
382 pDevice->fTxDataInSleep = FALSE; 382 pDevice->fTxDataInSleep = FALSE;
@@ -619,7 +619,7 @@ s_vMgrRxAssocRequest(
619 PSDevice pDevice, 619 PSDevice pDevice,
620 PSMgmtObject pMgmt, 620 PSMgmtObject pMgmt,
621 PSRxMgmtPacket pRxPacket, 621 PSRxMgmtPacket pRxPacket,
622 UINT uNodeIndex 622 unsigned int uNodeIndex
623 ) 623 )
624{ 624{
625 WLAN_FR_ASSOCREQ sFrame; 625 WLAN_FR_ASSOCREQ sFrame;
@@ -627,7 +627,7 @@ s_vMgrRxAssocRequest(
627 PSTxMgmtPacket pTxPacket; 627 PSTxMgmtPacket pTxPacket;
628 WORD wAssocStatus = 0; 628 WORD wAssocStatus = 0;
629 WORD wAssocAID = 0; 629 WORD wAssocAID = 0;
630 UINT uRateLen = WLAN_RATES_MAXLEN; 630 unsigned int uRateLen = WLAN_RATES_MAXLEN;
631 BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 631 BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
632 BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 632 BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
633 633
@@ -775,7 +775,7 @@ s_vMgrRxReAssocRequest(
775 PSDevice pDevice, 775 PSDevice pDevice,
776 PSMgmtObject pMgmt, 776 PSMgmtObject pMgmt,
777 PSRxMgmtPacket pRxPacket, 777 PSRxMgmtPacket pRxPacket,
778 UINT uNodeIndex 778 unsigned int uNodeIndex
779 ) 779 )
780{ 780{
781 WLAN_FR_REASSOCREQ sFrame; 781 WLAN_FR_REASSOCREQ sFrame;
@@ -783,7 +783,7 @@ s_vMgrRxReAssocRequest(
783 PSTxMgmtPacket pTxPacket; 783 PSTxMgmtPacket pTxPacket;
784 WORD wAssocStatus = 0; 784 WORD wAssocStatus = 0;
785 WORD wAssocAID = 0; 785 WORD wAssocAID = 0;
786 UINT uRateLen = WLAN_RATES_MAXLEN; 786 unsigned int uRateLen = WLAN_RATES_MAXLEN;
787 BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 787 BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
788 BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 788 BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
789 789
@@ -1257,7 +1257,7 @@ s_vMgrRxAuthenSequence_1(
1257 ) 1257 )
1258{ 1258{
1259 PSTxMgmtPacket pTxPacket = NULL; 1259 PSTxMgmtPacket pTxPacket = NULL;
1260 UINT uNodeIndex; 1260 unsigned int uNodeIndex;
1261 WLAN_FR_AUTHEN sFrame; 1261 WLAN_FR_AUTHEN sFrame;
1262 PSKeyItem pTransmitKey; 1262 PSKeyItem pTransmitKey;
1263 1263
@@ -1464,8 +1464,8 @@ s_vMgrRxAuthenSequence_3(
1464 ) 1464 )
1465{ 1465{
1466 PSTxMgmtPacket pTxPacket = NULL; 1466 PSTxMgmtPacket pTxPacket = NULL;
1467 UINT uStatusCode = 0 ; 1467 unsigned int uStatusCode = 0 ;
1468 UINT uNodeIndex = 0; 1468 unsigned int uNodeIndex = 0;
1469 WLAN_FR_AUTHEN sFrame; 1469 WLAN_FR_AUTHEN sFrame;
1470 1470
1471 if (!WLAN_GET_FC_ISWEP(pFrame->pHdr->sA3.wFrameCtl)) { 1471 if (!WLAN_GET_FC_ISWEP(pFrame->pHdr->sA3.wFrameCtl)) {
@@ -1590,7 +1590,7 @@ s_vMgrRxDisassociation(
1590 ) 1590 )
1591{ 1591{
1592 WLAN_FR_DISASSOC sFrame; 1592 WLAN_FR_DISASSOC sFrame;
1593 UINT uNodeIndex = 0; 1593 unsigned int uNodeIndex = 0;
1594 CMD_STATUS CmdStatus; 1594 CMD_STATUS CmdStatus;
1595 viawget_wpa_header *wpahdr; 1595 viawget_wpa_header *wpahdr;
1596 1596
@@ -1680,7 +1680,7 @@ s_vMgrRxDeauthentication(
1680 ) 1680 )
1681{ 1681{
1682 WLAN_FR_DEAUTHEN sFrame; 1682 WLAN_FR_DEAUTHEN sFrame;
1683 UINT uNodeIndex = 0; 1683 unsigned int uNodeIndex = 0;
1684 viawget_wpa_header *wpahdr; 1684 viawget_wpa_header *wpahdr;
1685 1685
1686 1686
@@ -1817,17 +1817,17 @@ s_vMgrRxBeacon(
1817 BOOL bUpdateTSF = FALSE; 1817 BOOL bUpdateTSF = FALSE;
1818 BOOL bIsAPBeacon = FALSE; 1818 BOOL bIsAPBeacon = FALSE;
1819 BOOL bIsChannelEqual = FALSE; 1819 BOOL bIsChannelEqual = FALSE;
1820 UINT uLocateByteIndex; 1820 unsigned int uLocateByteIndex;
1821 BYTE byTIMBitOn = 0; 1821 BYTE byTIMBitOn = 0;
1822 WORD wAIDNumber = 0; 1822 WORD wAIDNumber = 0;
1823 UINT uNodeIndex; 1823 unsigned int uNodeIndex;
1824 QWORD qwTimestamp, qwLocalTSF; 1824 QWORD qwTimestamp, qwLocalTSF;
1825 QWORD qwCurrTSF; 1825 QWORD qwCurrTSF;
1826 WORD wStartIndex = 0; 1826 WORD wStartIndex = 0;
1827 WORD wAIDIndex = 0; 1827 WORD wAIDIndex = 0;
1828 BYTE byCurrChannel = pRxPacket->byRxChannel; 1828 BYTE byCurrChannel = pRxPacket->byRxChannel;
1829 ERPObject sERP; 1829 ERPObject sERP;
1830 UINT uRateLen = WLAN_RATES_MAXLEN; 1830 unsigned int uRateLen = WLAN_RATES_MAXLEN;
1831 BOOL bChannelHit = FALSE; 1831 BOOL bChannelHit = FALSE;
1832 BYTE byOldPreambleType; 1832 BYTE byOldPreambleType;
1833 1833
@@ -2336,7 +2336,7 @@ void vMgrCreateOwnIBSS(void *hDeviceContext,
2336 BYTE byTopCCKBasicRate; 2336 BYTE byTopCCKBasicRate;
2337 BYTE byTopOFDMBasicRate; 2337 BYTE byTopOFDMBasicRate;
2338 QWORD qwCurrTSF; 2338 QWORD qwCurrTSF;
2339 UINT ii; 2339 unsigned int ii;
2340 BYTE abyRATE[] = {0x82, 0x84, 0x8B, 0x96, 0x24, 0x30, 0x48, 0x6C, 0x0C, 0x12, 0x18, 0x60}; 2340 BYTE abyRATE[] = {0x82, 0x84, 0x8B, 0x96, 0x24, 0x30, 0x48, 0x6C, 0x0C, 0x12, 0x18, 0x60};
2341 BYTE abyCCK_RATE[] = {0x82, 0x84, 0x8B, 0x96}; 2341 BYTE abyCCK_RATE[] = {0x82, 0x84, 0x8B, 0x96};
2342 BYTE abyOFDM_RATE[] = {0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C}; 2342 BYTE abyOFDM_RATE[] = {0x0C, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C};
@@ -2601,11 +2601,11 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)
2601 PSDevice pDevice = (PSDevice)hDeviceContext; 2601 PSDevice pDevice = (PSDevice)hDeviceContext;
2602 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 2602 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
2603 PKnownBSS pCurr = NULL; 2603 PKnownBSS pCurr = NULL;
2604 UINT ii, uu; 2604 unsigned int ii, uu;
2605 PWLAN_IE_SUPP_RATES pItemRates = NULL; 2605 PWLAN_IE_SUPP_RATES pItemRates = NULL;
2606 PWLAN_IE_SUPP_RATES pItemExtRates = NULL; 2606 PWLAN_IE_SUPP_RATES pItemExtRates = NULL;
2607 PWLAN_IE_SSID pItemSSID; 2607 PWLAN_IE_SSID pItemSSID;
2608 UINT uRateLen = WLAN_RATES_MAXLEN; 2608 unsigned int uRateLen = WLAN_RATES_MAXLEN;
2609 WORD wMaxBasicRate = RATE_1M; 2609 WORD wMaxBasicRate = RATE_1M;
2610 WORD wMaxSuppRate = RATE_1M; 2610 WORD wMaxSuppRate = RATE_1M;
2611 WORD wSuppRate; 2611 WORD wSuppRate;
@@ -2705,9 +2705,10 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)
2705 uRateLen); 2705 uRateLen);
2706 // Stuffing Rate IE 2706 // Stuffing Rate IE
2707 if ((pItemExtRates->len > 0) && (pItemRates->len < 8)) { 2707 if ((pItemExtRates->len > 0) && (pItemRates->len < 8)) {
2708 for (ii = 0; ii < (UINT)(8 - pItemRates->len); ) { 2708 for (ii = 0; ii < (unsigned int) (8 - pItemRates->len); ) {
2709 pItemRates->abyRates[pItemRates->len + ii] = pItemExtRates->abyRates[ii]; 2709 pItemRates->abyRates[pItemRates->len + ii] =
2710 ii ++; 2710 pItemExtRates->abyRates[ii];
2711 ii++;
2711 if (pItemExtRates->len <= ii) 2712 if (pItemExtRates->len <= ii)
2712 break; 2713 break;
2713 } 2714 }
@@ -2931,7 +2932,7 @@ static
2931void 2932void
2932s_vMgrSynchBSS ( 2933s_vMgrSynchBSS (
2933 PSDevice pDevice, 2934 PSDevice pDevice,
2934 UINT uBSSMode, 2935 unsigned int uBSSMode,
2935 PKnownBSS pCurr, 2936 PKnownBSS pCurr,
2936 PCMD_STATUS pStatus 2937 PCMD_STATUS pStatus
2937 ) 2938 )
@@ -3096,7 +3097,7 @@ s_vMgrSynchBSS (
3096 ) 3097 )
3097 { 3098 {
3098 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 3099 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
3099 // UINT ii , uSameBssidNum=0; 3100 /* unsigned int ii, uSameBssidNum=0; */
3100 3101
3101 // for (ii = 0; ii < MAX_BSS_NUM; ii++) { 3102 // for (ii = 0; ii < MAX_BSS_NUM; ii++) {
3102 // if (pMgmt->sBSSList[ii].bActive && 3103 // if (pMgmt->sBSSList[ii].bActive &&
@@ -3155,7 +3156,7 @@ s_vMgrFormatTIM(
3155{ 3156{
3156 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; 3157 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
3157 BYTE byMap; 3158 BYTE byMap;
3158 UINT ii, jj; 3159 unsigned int ii, jj;
3159 BOOL bStartFound = FALSE; 3160 BOOL bStartFound = FALSE;
3160 BOOL bMulticast = FALSE; 3161 BOOL bMulticast = FALSE;
3161 WORD wStartIndex = 0; 3162 WORD wStartIndex = 0;
@@ -3228,7 +3229,7 @@ s_MgrMakeBeacon(
3228 PSMgmtObject pMgmt, 3229 PSMgmtObject pMgmt,
3229 WORD wCurrCapInfo, 3230 WORD wCurrCapInfo,
3230 WORD wCurrBeaconPeriod, 3231 WORD wCurrBeaconPeriod,
3231 UINT uCurrChannel, 3232 unsigned int uCurrChannel,
3232 WORD wCurrATIMWinodw, 3233 WORD wCurrATIMWinodw,
3233 PWLAN_IE_SSID pCurrSSID, 3234 PWLAN_IE_SSID pCurrSSID,
3234 PBYTE pCurrBSSID, 3235 PBYTE pCurrBSSID,
@@ -3402,7 +3403,7 @@ s_MgrMakeProbeResponse(
3402 PSMgmtObject pMgmt, 3403 PSMgmtObject pMgmt,
3403 WORD wCurrCapInfo, 3404 WORD wCurrCapInfo,
3404 WORD wCurrBeaconPeriod, 3405 WORD wCurrBeaconPeriod,
3405 UINT uCurrChannel, 3406 unsigned int uCurrChannel,
3406 WORD wCurrATIMWinodw, 3407 WORD wCurrATIMWinodw,
3407 PBYTE pDstAddr, 3408 PBYTE pDstAddr,
3408 PWLAN_IE_SSID pCurrSSID, 3409 PWLAN_IE_SSID pCurrSSID,
@@ -3672,7 +3673,7 @@ s_MgrMakeAssocRequest(
3672 } else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || 3673 } else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
3673 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) && 3674 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
3674 (pMgmt->pCurrBSS != NULL)) { 3675 (pMgmt->pCurrBSS != NULL)) {
3675 UINT ii; 3676 unsigned int ii;
3676 PWORD pwPMKID; 3677 PWORD pwPMKID;
3677 3678
3678 // WPA IE 3679 // WPA IE
@@ -3932,7 +3933,7 @@ s_MgrMakeReAssocRequest(
3932 } else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || 3933 } else if (((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
3933 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) && 3934 (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) &&
3934 (pMgmt->pCurrBSS != NULL)) { 3935 (pMgmt->pCurrBSS != NULL)) {
3935 UINT ii; 3936 unsigned int ii;
3936 PWORD pwPMKID; 3937 PWORD pwPMKID;
3937 3938
3938 /* WPA IE */ 3939 /* WPA IE */
@@ -4422,7 +4423,7 @@ void vMgrRxManagePacket(void *hDeviceContext,
4422{ 4423{
4423 PSDevice pDevice = (PSDevice)hDeviceContext; 4424 PSDevice pDevice = (PSDevice)hDeviceContext;
4424 BOOL bInScan = FALSE; 4425 BOOL bInScan = FALSE;
4425 UINT uNodeIndex = 0; 4426 unsigned int uNodeIndex = 0;
4426 NODE_STATE eNodeState = 0; 4427 NODE_STATE eNodeState = 0;
4427 CMD_STATUS Status; 4428 CMD_STATUS Status;
4428 4429
@@ -4689,7 +4690,7 @@ BOOL bAdd_PMKID_Candidate(void *hDeviceContext,
4689{ 4690{
4690 PSDevice pDevice = (PSDevice)hDeviceContext; 4691 PSDevice pDevice = (PSDevice)hDeviceContext;
4691 PPMKID_CANDIDATE pCandidateList; 4692 PPMKID_CANDIDATE pCandidateList;
4692 UINT ii = 0; 4693 unsigned int ii = 0;
4693 4694
4694 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates); 4695 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate START: (%d)\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);
4695 4696
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index ec2ee7805f4e..1e5b916aea1d 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -84,37 +84,37 @@
84//mike define: make timer to expire after desired times 84//mike define: make timer to expire after desired times
85#define timer_expire(timer,next_tick) mod_timer(&timer, RUN_AT(next_tick)) 85#define timer_expire(timer,next_tick) mod_timer(&timer, RUN_AT(next_tick))
86 86
87typedef void (*TimerFunction)(ULONG); 87typedef void (*TimerFunction)(unsigned long);
88 88
89 89
90//+++ NDIS related 90//+++ NDIS related
91 91
92typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; 92typedef unsigned char NDIS_802_11_MAC_ADDRESS[ETH_ALEN];
93typedef struct _NDIS_802_11_AI_REQFI 93typedef struct _NDIS_802_11_AI_REQFI
94{ 94{
95 USHORT Capabilities; 95 unsigned short Capabilities;
96 USHORT ListenInterval; 96 unsigned short ListenInterval;
97 NDIS_802_11_MAC_ADDRESS CurrentAPAddress; 97 NDIS_802_11_MAC_ADDRESS CurrentAPAddress;
98} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI; 98} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
99 99
100typedef struct _NDIS_802_11_AI_RESFI 100typedef struct _NDIS_802_11_AI_RESFI
101{ 101{
102 USHORT Capabilities; 102 unsigned short Capabilities;
103 USHORT StatusCode; 103 unsigned short StatusCode;
104 USHORT AssociationId; 104 unsigned short AssociationId;
105} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI; 105} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
106 106
107typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION 107typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
108{ 108{
109 ULONG Length; 109 unsigned long Length;
110 USHORT AvailableRequestFixedIEs; 110 unsigned short AvailableRequestFixedIEs;
111 NDIS_802_11_AI_REQFI RequestFixedIEs; 111 NDIS_802_11_AI_REQFI RequestFixedIEs;
112 ULONG RequestIELength; 112 unsigned long RequestIELength;
113 ULONG OffsetRequestIEs; 113 unsigned long OffsetRequestIEs;
114 USHORT AvailableResponseFixedIEs; 114 unsigned short AvailableResponseFixedIEs;
115 NDIS_802_11_AI_RESFI ResponseFixedIEs; 115 NDIS_802_11_AI_RESFI ResponseFixedIEs;
116 ULONG ResponseIELength; 116 unsigned long ResponseIELength;
117 ULONG OffsetResponseIEs; 117 unsigned long OffsetResponseIEs;
118} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION; 118} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;
119 119
120 120
@@ -123,7 +123,7 @@ typedef struct tagSAssocInfo {
123 NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo; 123 NDIS_802_11_ASSOCIATION_INFORMATION AssocInfo;
124 BYTE abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN]; 124 BYTE abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN];
125 // store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION 125 // store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION
126 ULONG RequestIELength; 126 unsigned long RequestIELength;
127 BYTE abyReqIEs[WLAN_BEACON_FR_MAXLEN]; 127 BYTE abyReqIEs[WLAN_BEACON_FR_MAXLEN];
128} SAssocInfo, *PSAssocInfo; 128} SAssocInfo, *PSAssocInfo;
129//--- 129//---
@@ -222,8 +222,8 @@ typedef enum tagWMAC_POWER_MODE {
222typedef struct tagSTxMgmtPacket { 222typedef struct tagSTxMgmtPacket {
223 223
224 PUWLAN_80211HDR p80211Header; 224 PUWLAN_80211HDR p80211Header;
225 UINT cbMPDULen; 225 unsigned int cbMPDULen;
226 UINT cbPayloadLen; 226 unsigned int cbPayloadLen;
227 227
228} STxMgmtPacket, *PSTxMgmtPacket; 228} STxMgmtPacket, *PSTxMgmtPacket;
229 229
@@ -233,9 +233,9 @@ typedef struct tagSRxMgmtPacket {
233 233
234 PUWLAN_80211HDR p80211Header; 234 PUWLAN_80211HDR p80211Header;
235 QWORD qwLocalTSF; 235 QWORD qwLocalTSF;
236 UINT cbMPDULen; 236 unsigned int cbMPDULen;
237 UINT cbPayloadLen; 237 unsigned int cbPayloadLen;
238 UINT uRSSI; 238 unsigned int uRSSI;
239 BYTE bySQ; 239 BYTE bySQ;
240 BYTE byRxRate; 240 BYTE byRxRate;
241 BYTE byRxChannel; 241 BYTE byRxChannel;
@@ -272,21 +272,21 @@ typedef struct tagSMgmtObject
272 BOOL bCurrBSSIDFilterOn; 272 BOOL bCurrBSSIDFilterOn;
273 273
274 // Current state vars 274 // Current state vars
275 UINT uCurrChannel; 275 unsigned int uCurrChannel;
276 BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 276 BYTE abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
277 BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 277 BYTE abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
278 BYTE abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 278 BYTE abyCurrSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
279 BYTE abyCurrBSSID[WLAN_BSSID_LEN]; 279 BYTE abyCurrBSSID[WLAN_BSSID_LEN];
280 WORD wCurrCapInfo; 280 WORD wCurrCapInfo;
281 WORD wCurrAID; 281 WORD wCurrAID;
282 UINT uRSSITrigger; 282 unsigned int uRSSITrigger;
283 WORD wCurrATIMWindow; 283 WORD wCurrATIMWindow;
284 WORD wCurrBeaconPeriod; 284 WORD wCurrBeaconPeriod;
285 BOOL bIsDS; 285 BOOL bIsDS;
286 BYTE byERPContext; 286 BYTE byERPContext;
287 287
288 CMD_STATE eCommandState; 288 CMD_STATE eCommandState;
289 UINT uScanChannel; 289 unsigned int uScanChannel;
290 290
291 // Desire joinning BSS vars 291 // Desire joinning BSS vars
292 BYTE abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 292 BYTE abyDesireSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
@@ -301,22 +301,22 @@ typedef struct tagSMgmtObject
301 // Adhoc or AP configuration vars 301 // Adhoc or AP configuration vars
302 WORD wIBSSBeaconPeriod; 302 WORD wIBSSBeaconPeriod;
303 WORD wIBSSATIMWindow; 303 WORD wIBSSATIMWindow;
304 UINT uIBSSChannel; 304 unsigned int uIBSSChannel;
305 BYTE abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; 305 BYTE abyIBSSSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
306 BYTE byAPBBType; 306 BYTE byAPBBType;
307 BYTE abyWPAIE[MAX_WPA_IE_LEN]; 307 BYTE abyWPAIE[MAX_WPA_IE_LEN];
308 WORD wWPAIELen; 308 WORD wWPAIELen;
309 309
310 UINT uAssocCount; 310 unsigned int uAssocCount;
311 BOOL bMoreData; 311 BOOL bMoreData;
312 312
313 // Scan state vars 313 // Scan state vars
314 WMAC_SCAN_STATE eScanState; 314 WMAC_SCAN_STATE eScanState;
315 WMAC_SCAN_TYPE eScanType; 315 WMAC_SCAN_TYPE eScanType;
316 UINT uScanStartCh; 316 unsigned int uScanStartCh;
317 UINT uScanEndCh; 317 unsigned int uScanEndCh;
318 WORD wScanSteps; 318 WORD wScanSteps;
319 UINT uScanBSSType; 319 unsigned int uScanBSSType;
320 // Desire scannig vars 320 // Desire scannig vars
321 BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 321 BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
322 BYTE abyScanBSSID[WLAN_BSSID_LEN]; 322 BYTE abyScanBSSID[WLAN_BSSID_LEN];
@@ -344,8 +344,8 @@ typedef struct tagSMgmtObject
344 BYTE abyPSTxMap[MAX_NODE_NUM + 1]; 344 BYTE abyPSTxMap[MAX_NODE_NUM + 1];
345 345
346 // managment command related 346 // managment command related
347 UINT uCmdBusy; 347 unsigned int uCmdBusy;
348 UINT uCmdHostAPBusy; 348 unsigned int uCmdHostAPBusy;
349 349
350 // managment packet pool 350 // managment packet pool
351 PBYTE pbyMgmtPacketPool; 351 PBYTE pbyMgmtPacketPool;
@@ -389,7 +389,7 @@ typedef struct tagSMgmtObject
389 BOOL bSwitchChannel; 389 BOOL bSwitchChannel;
390 BYTE byNewChannel; 390 BYTE byNewChannel;
391 PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep; 391 PWLAN_IE_MEASURE_REP pCurrMeasureEIDRep;
392 UINT uLengthOfRepEIDs; 392 unsigned int uLengthOfRepEIDs;
393 BYTE abyCurrentMSRReq[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN]; 393 BYTE abyCurrentMSRReq[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
394 BYTE abyCurrentMSRRep[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN]; 394 BYTE abyCurrentMSRRep[sizeof(STxMgmtPacket) + WLAN_A3FR_MAXLEN];
395 BYTE abyIECountry[WLAN_A3FR_MAXLEN]; 395 BYTE abyIECountry[WLAN_A3FR_MAXLEN];
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index 9bd6bf5bf37c..6d13190885d1 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -260,14 +260,14 @@ WPA2vParseRSN (
260 * Return Value: length of IEs. 260 * Return Value: length of IEs.
261 * 261 *
262-*/ 262-*/
263UINT 263unsigned int
264WPA2uSetIEs(void *pMgmtHandle, 264WPA2uSetIEs(void *pMgmtHandle,
265 PWLAN_IE_RSN pRSNIEs 265 PWLAN_IE_RSN pRSNIEs
266 ) 266 )
267{ 267{
268 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; 268 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
269 PBYTE pbyBuffer = NULL; 269 PBYTE pbyBuffer = NULL;
270 UINT ii = 0; 270 unsigned int ii = 0;
271 PWORD pwPMKID = NULL; 271 PWORD pwPMKID = NULL;
272 272
273 if (pRSNIEs == NULL) { 273 if (pRSNIEs == NULL) {
diff --git a/drivers/staging/vt6656/wpa2.h b/drivers/staging/vt6656/wpa2.h
index 79305a79b9da..429a910a5c50 100644
--- a/drivers/staging/vt6656/wpa2.h
+++ b/drivers/staging/vt6656/wpa2.h
@@ -45,7 +45,7 @@ typedef struct tagsPMKIDInfo {
45} PMKIDInfo, *PPMKIDInfo; 45} PMKIDInfo, *PPMKIDInfo;
46 46
47typedef struct tagSPMKIDCache { 47typedef struct tagSPMKIDCache {
48 ULONG BSSIDInfoCount; 48 unsigned long BSSIDInfoCount;
49 PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE]; 49 PMKIDInfo BSSIDInfo[MAX_PMKID_CACHE];
50} SPMKIDCache, *PSPMKIDCache; 50} SPMKIDCache, *PSPMKIDCache;
51 51
@@ -69,7 +69,7 @@ WPA2vParseRSN (
69 PWLAN_IE_RSN pRSN 69 PWLAN_IE_RSN pRSN
70 ); 70 );
71 71
72UINT 72unsigned int
73WPA2uSetIEs( 73WPA2uSetIEs(
74 void *pMgmtHandle, 74 void *pMgmtHandle,
75 PWLAN_IE_RSN pRSNIEs 75 PWLAN_IE_RSN pRSNIEs
diff --git a/drivers/staging/vt6656/wpactl.h b/drivers/staging/vt6656/wpactl.h
index 3a2f15f3f249..00c8451ab50b 100644
--- a/drivers/staging/vt6656/wpactl.h
+++ b/drivers/staging/vt6656/wpactl.h
@@ -52,9 +52,7 @@ typedef enum { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE,
52#define GENERIC_INFO_ELEM 0xdd 52#define GENERIC_INFO_ELEM 0xdd
53#define RSN_INFO_ELEM 0x30 53#define RSN_INFO_ELEM 0x30
54 54
55 55typedef unsigned long long NDIS_802_11_KEY_RSC;
56
57typedef ULONGLONG NDIS_802_11_KEY_RSC;
58 56
59/*--------------------- Export Classes ----------------------------*/ 57/*--------------------- Export Classes ----------------------------*/
60 58
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-04 06:55:43 -0500