aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2010-05-12 23:54:39 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-14 16:24:03 -0400
commit3a215e0ff4184314f7f1a099354a272ddedff289 (patch)
tree997552cb95f28681348474b04ebd88f25c366a4b
parent71e510673134999627fd180181079ffccb9ec756 (diff)
Staging: vt6655: remove IN definition
Remove empty IN definition used to specify input parameters. Signed-off-by: Charles Clément <caratorn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat
-rw-r--r--drivers/staging/vt6655/80211mgr.c44
-rw-r--r--drivers/staging/vt6655/80211mgr.h44
-rw-r--r--drivers/staging/vt6655/IEEE11h.c6
-rw-r--r--drivers/staging/vt6655/IEEE11h.h2
-rw-r--r--drivers/staging/vt6655/baseband.c24
-rw-r--r--drivers/staging/vt6655/baseband.h20
-rw-r--r--drivers/staging/vt6655/bssdb.c138
-rw-r--r--drivers/staging/vt6655/bssdb.h126
-rw-r--r--drivers/staging/vt6655/card.c90
-rw-r--r--drivers/staging/vt6655/card.h78
-rw-r--r--drivers/staging/vt6655/datarate.c26
-rw-r--r--drivers/staging/vt6655/datarate.h22
-rw-r--r--drivers/staging/vt6655/device_main.c2
-rw-r--r--drivers/staging/vt6655/dpc.c108
-rw-r--r--drivers/staging/vt6655/dpc.h4
-rw-r--r--drivers/staging/vt6655/ioctl.c8
-rw-r--r--drivers/staging/vt6655/ioctl.h8
-rw-r--r--drivers/staging/vt6655/key.c14
-rw-r--r--drivers/staging/vt6655/key.h14
-rw-r--r--drivers/staging/vt6655/power.c20
-rw-r--r--drivers/staging/vt6655/power.h22
-rw-r--r--drivers/staging/vt6655/rf.c20
-rw-r--r--drivers/staging/vt6655/rf.h12
-rw-r--r--drivers/staging/vt6655/rxtx.c342
-rw-r--r--drivers/staging/vt6655/rxtx.h64
-rw-r--r--drivers/staging/vt6655/ttype.h4
-rw-r--r--drivers/staging/vt6655/vntwifi.c102
-rw-r--r--drivers/staging/vt6655/vntwifi.h104
-rw-r--r--drivers/staging/vt6655/wcmd.c46
-rw-r--r--drivers/staging/vt6655/wcmd.h18
-rw-r--r--drivers/staging/vt6655/wmgr.c488
-rw-r--r--drivers/staging/vt6655/wmgr.h58
-rw-r--r--drivers/staging/vt6655/wpa.c10
-rw-r--r--drivers/staging/vt6655/wpa.h10
-rw-r--r--drivers/staging/vt6655/wpa2.c8
-rw-r--r--drivers/staging/vt6655/wpa2.h8
36 files changed, 1055 insertions, 1059 deletions
diff --git a/drivers/staging/vt6655/80211mgr.c b/drivers/staging/vt6655/80211mgr.c
index da964a92f96..38697c86248 100644
--- a/drivers/staging/vt6655/80211mgr.c
+++ b/drivers/staging/vt6655/80211mgr.c
@@ -91,7 +91,7 @@ static int msglevel =MSG_LEVEL_INFO;
91 91
92void 92void
93vMgrEncodeBeacon( 93vMgrEncodeBeacon(
94 IN PWLAN_FR_BEACON pFrame 94 PWLAN_FR_BEACON pFrame
95 ) 95 )
96{ 96{
97 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 97 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -123,7 +123,7 @@ vMgrEncodeBeacon(
123 123
124void 124void
125vMgrDecodeBeacon( 125vMgrDecodeBeacon(
126 IN PWLAN_FR_BEACON pFrame 126 PWLAN_FR_BEACON pFrame
127 ) 127 )
128{ 128{
129 PWLAN_IE pItem; 129 PWLAN_IE pItem;
@@ -244,7 +244,7 @@ vMgrDecodeBeacon(
244 244
245void 245void
246vMgrEncodeIBSSATIM( 246vMgrEncodeIBSSATIM(
247 IN PWLAN_FR_IBSSATIM pFrame 247 PWLAN_FR_IBSSATIM pFrame
248 ) 248 )
249{ 249{
250 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 250 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -267,7 +267,7 @@ vMgrEncodeIBSSATIM(
267 267
268void 268void
269vMgrDecodeIBSSATIM( 269vMgrDecodeIBSSATIM(
270 IN PWLAN_FR_IBSSATIM pFrame 270 PWLAN_FR_IBSSATIM pFrame
271 ) 271 )
272{ 272{
273 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 273 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -289,7 +289,7 @@ vMgrDecodeIBSSATIM(
289 289
290void 290void
291vMgrEncodeDisassociation( 291vMgrEncodeDisassociation(
292 IN PWLAN_FR_DISASSOC pFrame 292 PWLAN_FR_DISASSOC pFrame
293 ) 293 )
294{ 294{
295 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 295 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -317,7 +317,7 @@ vMgrEncodeDisassociation(
317 317
318void 318void
319vMgrDecodeDisassociation( 319vMgrDecodeDisassociation(
320 IN PWLAN_FR_DISASSOC pFrame 320 PWLAN_FR_DISASSOC pFrame
321 ) 321 )
322{ 322{
323 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 323 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -343,7 +343,7 @@ vMgrDecodeDisassociation(
343 343
344void 344void
345vMgrEncodeAssocRequest( 345vMgrEncodeAssocRequest(
346 IN PWLAN_FR_ASSOCREQ pFrame 346 PWLAN_FR_ASSOCREQ pFrame
347 ) 347 )
348{ 348{
349 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 349 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -370,7 +370,7 @@ vMgrEncodeAssocRequest(
370 370
371void 371void
372vMgrDecodeAssocRequest( 372vMgrDecodeAssocRequest(
373 IN PWLAN_FR_ASSOCREQ pFrame 373 PWLAN_FR_ASSOCREQ pFrame
374 ) 374 )
375{ 375{
376 PWLAN_IE pItem; 376 PWLAN_IE pItem;
@@ -436,7 +436,7 @@ vMgrDecodeAssocRequest(
436 436
437void 437void
438vMgrEncodeAssocResponse( 438vMgrEncodeAssocResponse(
439 IN PWLAN_FR_ASSOCRESP pFrame 439 PWLAN_FR_ASSOCRESP pFrame
440 ) 440 )
441{ 441{
442 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 442 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -468,7 +468,7 @@ vMgrEncodeAssocResponse(
468 468
469void 469void
470vMgrDecodeAssocResponse( 470vMgrDecodeAssocResponse(
471 IN PWLAN_FR_ASSOCRESP pFrame 471 PWLAN_FR_ASSOCRESP pFrame
472 ) 472 )
473{ 473{
474 PWLAN_IE pItem; 474 PWLAN_IE pItem;
@@ -514,7 +514,7 @@ vMgrDecodeAssocResponse(
514 514
515void 515void
516vMgrEncodeReassocRequest( 516vMgrEncodeReassocRequest(
517 IN PWLAN_FR_REASSOCREQ pFrame 517 PWLAN_FR_REASSOCREQ pFrame
518 ) 518 )
519{ 519{
520 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 520 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -546,7 +546,7 @@ vMgrEncodeReassocRequest(
546 546
547void 547void
548vMgrDecodeReassocRequest( 548vMgrDecodeReassocRequest(
549 IN PWLAN_FR_REASSOCREQ pFrame 549 PWLAN_FR_REASSOCREQ pFrame
550 ) 550 )
551{ 551{
552 PWLAN_IE pItem; 552 PWLAN_IE pItem;
@@ -618,7 +618,7 @@ vMgrDecodeReassocRequest(
618 618
619void 619void
620vMgrEncodeProbeRequest( 620vMgrEncodeProbeRequest(
621 IN PWLAN_FR_PROBEREQ pFrame 621 PWLAN_FR_PROBEREQ pFrame
622 ) 622 )
623{ 623{
624 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 624 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -639,7 +639,7 @@ vMgrEncodeProbeRequest(
639 639
640void 640void
641vMgrDecodeProbeRequest( 641vMgrDecodeProbeRequest(
642 IN PWLAN_FR_PROBEREQ pFrame 642 PWLAN_FR_PROBEREQ pFrame
643 ) 643 )
644{ 644{
645 PWLAN_IE pItem; 645 PWLAN_IE pItem;
@@ -692,7 +692,7 @@ vMgrDecodeProbeRequest(
692 692
693void 693void
694vMgrEncodeProbeResponse( 694vMgrEncodeProbeResponse(
695 IN PWLAN_FR_PROBERESP pFrame 695 PWLAN_FR_PROBERESP pFrame
696 ) 696 )
697{ 697{
698 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 698 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -726,7 +726,7 @@ vMgrEncodeProbeResponse(
726 726
727void 727void
728vMgrDecodeProbeResponse( 728vMgrDecodeProbeResponse(
729 IN PWLAN_FR_PROBERESP pFrame 729 PWLAN_FR_PROBERESP pFrame
730 ) 730 )
731{ 731{
732 PWLAN_IE pItem; 732 PWLAN_IE pItem;
@@ -840,7 +840,7 @@ vMgrDecodeProbeResponse(
840 840
841void 841void
842vMgrEncodeAuthen( 842vMgrEncodeAuthen(
843 IN PWLAN_FR_AUTHEN pFrame 843 PWLAN_FR_AUTHEN pFrame
844 ) 844 )
845{ 845{
846 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 846 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -871,7 +871,7 @@ vMgrEncodeAuthen(
871 871
872void 872void
873vMgrDecodeAuthen( 873vMgrDecodeAuthen(
874 IN PWLAN_FR_AUTHEN pFrame 874 PWLAN_FR_AUTHEN pFrame
875 ) 875 )
876{ 876{
877 PWLAN_IE pItem; 877 PWLAN_IE pItem;
@@ -911,7 +911,7 @@ vMgrDecodeAuthen(
911 911
912void 912void
913vMgrEncodeDeauthen( 913vMgrEncodeDeauthen(
914 IN PWLAN_FR_DEAUTHEN pFrame 914 PWLAN_FR_DEAUTHEN pFrame
915 ) 915 )
916{ 916{
917 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 917 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -938,7 +938,7 @@ vMgrEncodeDeauthen(
938 938
939void 939void
940vMgrDecodeDeauthen( 940vMgrDecodeDeauthen(
941 IN PWLAN_FR_DEAUTHEN pFrame 941 PWLAN_FR_DEAUTHEN pFrame
942 ) 942 )
943{ 943{
944 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 944 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -964,7 +964,7 @@ vMgrDecodeDeauthen(
964 964
965void 965void
966vMgrEncodeReassocResponse( 966vMgrEncodeReassocResponse(
967 IN PWLAN_FR_REASSOCRESP pFrame 967 PWLAN_FR_REASSOCRESP pFrame
968 ) 968 )
969{ 969{
970 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; 970 pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -997,7 +997,7 @@ vMgrEncodeReassocResponse(
997 997
998void 998void
999vMgrDecodeReassocResponse( 999vMgrDecodeReassocResponse(
1000 IN PWLAN_FR_REASSOCRESP pFrame 1000 PWLAN_FR_REASSOCRESP pFrame
1001 ) 1001 )
1002{ 1002{
1003 PWLAN_IE pItem; 1003 PWLAN_IE pItem;
diff --git a/drivers/staging/vt6655/80211mgr.h b/drivers/staging/vt6655/80211mgr.h
index c3eafd28da4..658fe144f89 100644
--- a/drivers/staging/vt6655/80211mgr.h
+++ b/drivers/staging/vt6655/80211mgr.h
@@ -716,112 +716,112 @@ typedef struct tagWLAN_FR_DEAUTHEN {
716 716
717void 717void
718vMgrEncodeBeacon( 718vMgrEncodeBeacon(
719 IN PWLAN_FR_BEACON pFrame 719 PWLAN_FR_BEACON pFrame
720 ); 720 );
721 721
722void 722void
723vMgrDecodeBeacon( 723vMgrDecodeBeacon(
724 IN PWLAN_FR_BEACON pFrame 724 PWLAN_FR_BEACON pFrame
725 ); 725 );
726 726
727void 727void
728vMgrEncodeIBSSATIM( 728vMgrEncodeIBSSATIM(
729 IN PWLAN_FR_IBSSATIM pFrame 729 PWLAN_FR_IBSSATIM pFrame
730 ); 730 );
731 731
732void 732void
733vMgrDecodeIBSSATIM( 733vMgrDecodeIBSSATIM(
734 IN PWLAN_FR_IBSSATIM pFrame 734 PWLAN_FR_IBSSATIM pFrame
735 ); 735 );
736 736
737void 737void
738vMgrEncodeDisassociation( 738vMgrEncodeDisassociation(
739 IN PWLAN_FR_DISASSOC pFrame 739 PWLAN_FR_DISASSOC pFrame
740 ); 740 );
741 741
742void 742void
743vMgrDecodeDisassociation( 743vMgrDecodeDisassociation(
744 IN PWLAN_FR_DISASSOC pFrame 744 PWLAN_FR_DISASSOC pFrame
745 ); 745 );
746 746
747void 747void
748vMgrEncodeAssocRequest( 748vMgrEncodeAssocRequest(
749 IN PWLAN_FR_ASSOCREQ pFrame 749 PWLAN_FR_ASSOCREQ pFrame
750 ); 750 );
751 751
752void 752void
753vMgrDecodeAssocRequest( 753vMgrDecodeAssocRequest(
754 IN PWLAN_FR_ASSOCREQ pFrame 754 PWLAN_FR_ASSOCREQ pFrame
755 ); 755 );
756 756
757void 757void
758vMgrEncodeAssocResponse( 758vMgrEncodeAssocResponse(
759 IN PWLAN_FR_ASSOCRESP pFrame 759 PWLAN_FR_ASSOCRESP pFrame
760 ); 760 );
761 761
762void 762void
763vMgrDecodeAssocResponse( 763vMgrDecodeAssocResponse(
764 IN PWLAN_FR_ASSOCRESP pFrame 764 PWLAN_FR_ASSOCRESP pFrame
765 ); 765 );
766 766
767void 767void
768vMgrEncodeReassocRequest( 768vMgrEncodeReassocRequest(
769 IN PWLAN_FR_REASSOCREQ pFrame 769 PWLAN_FR_REASSOCREQ pFrame
770 ); 770 );
771 771
772void 772void
773vMgrDecodeReassocRequest( 773vMgrDecodeReassocRequest(
774 IN PWLAN_FR_REASSOCREQ pFrame 774 PWLAN_FR_REASSOCREQ pFrame
775 ); 775 );
776 776
777void 777void
778vMgrEncodeProbeRequest( 778vMgrEncodeProbeRequest(
779 IN PWLAN_FR_PROBEREQ pFrame 779 PWLAN_FR_PROBEREQ pFrame
780 ); 780 );
781 781
782void 782void
783vMgrDecodeProbeRequest( 783vMgrDecodeProbeRequest(
784 IN PWLAN_FR_PROBEREQ pFrame 784 PWLAN_FR_PROBEREQ pFrame
785 ); 785 );
786 786
787void 787void
788vMgrEncodeProbeResponse( 788vMgrEncodeProbeResponse(
789 IN PWLAN_FR_PROBERESP pFrame 789 PWLAN_FR_PROBERESP pFrame
790 ); 790 );
791 791
792void 792void
793vMgrDecodeProbeResponse( 793vMgrDecodeProbeResponse(
794 IN PWLAN_FR_PROBERESP pFrame 794 PWLAN_FR_PROBERESP pFrame
795 ); 795 );
796 796
797void 797void
798vMgrEncodeAuthen( 798vMgrEncodeAuthen(
799 IN PWLAN_FR_AUTHEN pFrame 799 PWLAN_FR_AUTHEN pFrame
800 ); 800 );
801 801
802void 802void
803vMgrDecodeAuthen( 803vMgrDecodeAuthen(
804 IN PWLAN_FR_AUTHEN pFrame 804 PWLAN_FR_AUTHEN pFrame
805 ); 805 );
806 806
807void 807void
808vMgrEncodeDeauthen( 808vMgrEncodeDeauthen(
809 IN PWLAN_FR_DEAUTHEN pFrame 809 PWLAN_FR_DEAUTHEN pFrame
810 ); 810 );
811 811
812void 812void
813vMgrDecodeDeauthen( 813vMgrDecodeDeauthen(
814 IN PWLAN_FR_DEAUTHEN pFrame 814 PWLAN_FR_DEAUTHEN pFrame
815 ); 815 );
816 816
817void 817void
818vMgrEncodeReassocResponse( 818vMgrEncodeReassocResponse(
819 IN PWLAN_FR_REASSOCRESP pFrame 819 PWLAN_FR_REASSOCRESP pFrame
820 ); 820 );
821 821
822void 822void
823vMgrDecodeReassocResponse( 823vMgrDecodeReassocResponse(
824 IN PWLAN_FR_REASSOCRESP pFrame 824 PWLAN_FR_REASSOCRESP pFrame
825 ); 825 );
826 826
827#endif// __80211MGR_H__ 827#endif// __80211MGR_H__
diff --git a/drivers/staging/vt6655/IEEE11h.c b/drivers/staging/vt6655/IEEE11h.c
index 77813002d2f..22f12f5ef90 100644
--- a/drivers/staging/vt6655/IEEE11h.c
+++ b/drivers/staging/vt6655/IEEE11h.c
@@ -203,8 +203,8 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR
203-*/ 203-*/
204BOOL 204BOOL
205IEEE11hbMgrRxAction ( 205IEEE11hbMgrRxAction (
206 IN void *pMgmtHandle, 206 void *pMgmtHandle,
207 IN void *pRxPacket 207 void *pRxPacket
208 ) 208 )
209{ 209{
210 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; 210 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
@@ -265,7 +265,7 @@ IEEE11hbMgrRxAction (
265 265
266 266
267BOOL IEEE11hbMSRRepTx ( 267BOOL IEEE11hbMSRRepTx (
268 IN void *pMgmtHandle 268 void *pMgmtHandle
269 ) 269 )
270{ 270{
271 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle; 271 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtHandle;
diff --git a/drivers/staging/vt6655/IEEE11h.h b/drivers/staging/vt6655/IEEE11h.h
index 1707388e7cf..ae32498a511 100644
--- a/drivers/staging/vt6655/IEEE11h.h
+++ b/drivers/staging/vt6655/IEEE11h.h
@@ -46,7 +46,7 @@
46/*--------------------- Export Functions --------------------------*/ 46/*--------------------- Export Functions --------------------------*/
47 47
48BOOL IEEE11hbMSRRepTx ( 48BOOL IEEE11hbMSRRepTx (
49 IN void *pMgmtHandle 49 void *pMgmtHandle
50 ); 50 );
51 51
52#endif // __IEEE11h_H__ 52#endif // __IEEE11h_H__
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index 7a69490fc7e..2931a0ffcf3 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -1725,13 +1725,13 @@ s_ulGetRatio(PSDevice pDevice);
1725static 1725static
1726void 1726void
1727s_vChangeAntenna( 1727s_vChangeAntenna(
1728 IN PSDevice pDevice 1728 PSDevice pDevice
1729 ); 1729 );
1730 1730
1731static 1731static
1732void 1732void
1733s_vChangeAntenna ( 1733s_vChangeAntenna (
1734 IN PSDevice pDevice 1734 PSDevice pDevice
1735 ) 1735 )
1736{ 1736{
1737 1737
@@ -1778,10 +1778,10 @@ s_vChangeAntenna (
1778 */ 1778 */
1779UINT 1779UINT
1780BBuGetFrameTime ( 1780BBuGetFrameTime (
1781 IN BYTE byPreambleType, 1781 BYTE byPreambleType,
1782 IN BYTE byPktType, 1782 BYTE byPktType,
1783 IN UINT cbFrameLength, 1783 UINT cbFrameLength,
1784 IN WORD wRate 1784 WORD wRate
1785 ) 1785 )
1786{ 1786{
1787 UINT uFrameTime; 1787 UINT uFrameTime;
@@ -1845,10 +1845,10 @@ BBuGetFrameTime (
1845 */ 1845 */
1846void 1846void
1847BBvCaculateParameter ( 1847BBvCaculateParameter (
1848 IN PSDevice pDevice, 1848 PSDevice pDevice,
1849 IN UINT cbFrameLength, 1849 UINT cbFrameLength,
1850 IN WORD wRate, 1850 WORD wRate,
1851 IN BYTE byPacketType, 1851 BYTE byPacketType,
1852 OUT PWORD pwPhyLen, 1852 OUT PWORD pwPhyLen,
1853 OUT PBYTE pbyPhySrv, 1853 OUT PBYTE pbyPhySrv,
1854 OUT PBYTE pbyPhySgn 1854 OUT PBYTE pbyPhySgn
@@ -2878,7 +2878,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
2878 2878
2879void 2879void
2880TimerSQ3CallBack ( 2880TimerSQ3CallBack (
2881 IN void *hDeviceContext 2881 void *hDeviceContext
2882 ) 2882 )
2883{ 2883{
2884 PSDevice pDevice = (PSDevice)hDeviceContext; 2884 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -2926,7 +2926,7 @@ TimerSQ3CallBack (
2926 2926
2927void 2927void
2928TimerState1CallBack ( 2928TimerState1CallBack (
2929 IN void *hDeviceContext 2929 void *hDeviceContext
2930 ) 2930 )
2931{ 2931{
2932 PSDevice pDevice = (PSDevice)hDeviceContext; 2932 PSDevice pDevice = (PSDevice)hDeviceContext;
diff --git a/drivers/staging/vt6655/baseband.h b/drivers/staging/vt6655/baseband.h
index 23f7ad151d1..3eea7aa2fba 100644
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -120,18 +120,18 @@
120 120
121UINT 121UINT
122BBuGetFrameTime( 122BBuGetFrameTime(
123 IN BYTE byPreambleType, 123 BYTE byPreambleType,
124 IN BYTE byPktType, 124 BYTE byPktType,
125 IN UINT cbFrameLength, 125 UINT cbFrameLength,
126 IN WORD wRate 126 WORD wRate
127 ); 127 );
128 128
129void 129void
130BBvCaculateParameter ( 130BBvCaculateParameter (
131 IN PSDevice pDevice, 131 PSDevice pDevice,
132 IN UINT cbFrameLength, 132 UINT cbFrameLength,
133 IN WORD wRate, 133 WORD wRate,
134 IN BYTE byPacketType, 134 BYTE byPacketType,
135 OUT PWORD pwPhyLen, 135 OUT PWORD pwPhyLen,
136 OUT PBYTE pbyPhySrv, 136 OUT PBYTE pbyPhySrv,
137 OUT PBYTE pbyPhySgn 137 OUT PBYTE pbyPhySgn
@@ -162,12 +162,12 @@ void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
162 162
163void 163void
164TimerSQ3CallBack ( 164TimerSQ3CallBack (
165 IN void *hDeviceContext 165 void *hDeviceContext
166 ); 166 );
167 167
168void 168void
169TimerState1CallBack( 169TimerState1CallBack(
170 IN void *hDeviceContext 170 void *hDeviceContext
171 ); 171 );
172 172
173void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3); 173void BBvAntennaDiversity(PSDevice pDevice, BYTE byRxRate, BYTE bySQ3);
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c
index 3af0ccb25d0..e64238e5e8c 100644
--- a/drivers/staging/vt6655/bssdb.c
+++ b/drivers/staging/vt6655/bssdb.c
@@ -91,18 +91,18 @@ const WORD awHWRetry1[5][5] = {
91/*--------------------- Static Functions --------------------------*/ 91/*--------------------- Static Functions --------------------------*/
92 92
93void s_vCheckSensitivity( 93void s_vCheckSensitivity(
94 IN void *hDeviceContext 94 void *hDeviceContext
95 ); 95 );
96 96
97#ifdef Calcu_LinkQual 97#ifdef Calcu_LinkQual
98void s_uCalculateLinkQual( 98void s_uCalculateLinkQual(
99 IN void *hDeviceContext 99 void *hDeviceContext
100 ); 100 );
101#endif 101#endif
102 102
103 103
104void s_vCheckPreEDThreshold( 104void s_vCheckPreEDThreshold(
105 IN void *hDeviceContext 105 void *hDeviceContext
106 ); 106 );
107/*--------------------- Export Variables --------------------------*/ 107/*--------------------- Export Variables --------------------------*/
108 108
@@ -125,10 +125,10 @@ void s_vCheckPreEDThreshold(
125 125
126PKnownBSS 126PKnownBSS
127BSSpSearchBSSList( 127BSSpSearchBSSList(
128 IN void *hDeviceContext, 128 void *hDeviceContext,
129 IN PBYTE pbyDesireBSSID, 129 PBYTE pbyDesireBSSID,
130 IN PBYTE pbyDesireSSID, 130 PBYTE pbyDesireSSID,
131 IN CARD_PHY_TYPE ePhyType 131 CARD_PHY_TYPE ePhyType
132 ) 132 )
133{ 133{
134 PSDevice pDevice = (PSDevice)hDeviceContext; 134 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -282,8 +282,8 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE;
282 282
283void 283void
284BSSvClearBSSList( 284BSSvClearBSSList(
285 IN void *hDeviceContext, 285 void *hDeviceContext,
286 IN BOOL bKeepCurrBSSID 286 BOOL bKeepCurrBSSID
287 ) 287 )
288{ 288{
289 PSDevice pDevice = (PSDevice)hDeviceContext; 289 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -325,9 +325,9 @@ BSSvClearBSSList(
325-*/ 325-*/
326PKnownBSS 326PKnownBSS
327BSSpAddrIsInBSSList( 327BSSpAddrIsInBSSList(
328 IN void *hDeviceContext, 328 void *hDeviceContext,
329 IN PBYTE abyBSSID, 329 PBYTE abyBSSID,
330 IN PWLAN_IE_SSID pSSID 330 PWLAN_IE_SSID pSSID
331 ) 331 )
332{ 332{
333 PSDevice pDevice = (PSDevice)hDeviceContext; 333 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -368,23 +368,23 @@ BSSpAddrIsInBSSList(
368 368
369BOOL 369BOOL
370BSSbInsertToBSSList ( 370BSSbInsertToBSSList (
371 IN void *hDeviceContext, 371 void *hDeviceContext,
372 IN PBYTE abyBSSIDAddr, 372 PBYTE abyBSSIDAddr,
373 IN QWORD qwTimestamp, 373 QWORD qwTimestamp,
374 IN WORD wBeaconInterval, 374 WORD wBeaconInterval,
375 IN WORD wCapInfo, 375 WORD wCapInfo,
376 IN BYTE byCurrChannel, 376 BYTE byCurrChannel,
377 IN PWLAN_IE_SSID pSSID, 377 PWLAN_IE_SSID pSSID,
378 IN PWLAN_IE_SUPP_RATES pSuppRates, 378 PWLAN_IE_SUPP_RATES pSuppRates,
379 IN PWLAN_IE_SUPP_RATES pExtSuppRates, 379 PWLAN_IE_SUPP_RATES pExtSuppRates,
380 IN PERPObject psERP, 380 PERPObject psERP,
381 IN PWLAN_IE_RSN pRSN, 381 PWLAN_IE_RSN pRSN,
382 IN PWLAN_IE_RSN_EXT pRSNWPA, 382 PWLAN_IE_RSN_EXT pRSNWPA,
383 IN PWLAN_IE_COUNTRY pIE_Country, 383 PWLAN_IE_COUNTRY pIE_Country,
384 IN PWLAN_IE_QUIET pIE_Quiet, 384 PWLAN_IE_QUIET pIE_Quiet,
385 IN UINT uIELength, 385 UINT uIELength,
386 IN PBYTE pbyIEs, 386 PBYTE pbyIEs,
387 IN void *pRxPacketContext 387 void *pRxPacketContext
388 ) 388 )
389{ 389{
390 390
@@ -585,24 +585,24 @@ BSSbInsertToBSSList (
585 585
586BOOL 586BOOL
587BSSbUpdateToBSSList ( 587BSSbUpdateToBSSList (
588 IN void *hDeviceContext, 588 void *hDeviceContext,
589 IN QWORD qwTimestamp, 589 QWORD qwTimestamp,
590 IN WORD wBeaconInterval, 590 WORD wBeaconInterval,
591 IN WORD wCapInfo, 591 WORD wCapInfo,
592 IN BYTE byCurrChannel, 592 BYTE byCurrChannel,
593 IN BOOL bChannelHit, 593 BOOL bChannelHit,
594 IN PWLAN_IE_SSID pSSID, 594 PWLAN_IE_SSID pSSID,
595 IN PWLAN_IE_SUPP_RATES pSuppRates, 595 PWLAN_IE_SUPP_RATES pSuppRates,
596 IN PWLAN_IE_SUPP_RATES pExtSuppRates, 596 PWLAN_IE_SUPP_RATES pExtSuppRates,
597 IN PERPObject psERP, 597 PERPObject psERP,
598 IN PWLAN_IE_RSN pRSN, 598 PWLAN_IE_RSN pRSN,
599 IN PWLAN_IE_RSN_EXT pRSNWPA, 599 PWLAN_IE_RSN_EXT pRSNWPA,
600 IN PWLAN_IE_COUNTRY pIE_Country, 600 PWLAN_IE_COUNTRY pIE_Country,
601 IN PWLAN_IE_QUIET pIE_Quiet, 601 PWLAN_IE_QUIET pIE_Quiet,
602 IN PKnownBSS pBSSList, 602 PKnownBSS pBSSList,
603 IN UINT uIELength, 603 UINT uIELength,
604 IN PBYTE pbyIEs, 604 PBYTE pbyIEs,
605 IN void *pRxPacketContext 605 void *pRxPacketContext
606 ) 606 )
607{ 607{
608 int ii; 608 int ii;
@@ -764,8 +764,8 @@ BSSbUpdateToBSSList (
764 764
765BOOL 765BOOL
766BSSDBbIsSTAInNodeDB( 766BSSDBbIsSTAInNodeDB(
767 IN void *pMgmtObject, 767 void *pMgmtObject,
768 IN PBYTE abyDstAddr, 768 PBYTE abyDstAddr,
769 OUT PUINT puNodeIndex 769 OUT PUINT puNodeIndex
770 ) 770 )
771{ 771{
@@ -799,7 +799,7 @@ BSSDBbIsSTAInNodeDB(
799-*/ 799-*/
800void 800void
801BSSvCreateOneNode( 801BSSvCreateOneNode(
802 IN void *hDeviceContext, 802 void *hDeviceContext,
803 OUT PUINT puNodeIndex 803 OUT PUINT puNodeIndex
804 ) 804 )
805{ 805{
@@ -864,8 +864,8 @@ BSSvCreateOneNode(
864-*/ 864-*/
865void 865void
866BSSvRemoveOneNode( 866BSSvRemoveOneNode(
867 IN void *hDeviceContext, 867 void *hDeviceContext,
868 IN UINT uNodeIndex 868 UINT uNodeIndex
869 ) 869 )
870{ 870{
871 871
@@ -897,10 +897,10 @@ BSSvRemoveOneNode(
897 897
898void 898void
899BSSvUpdateAPNode( 899BSSvUpdateAPNode(
900 IN void *hDeviceContext, 900 void *hDeviceContext,
901 IN PWORD pwCapInfo, 901 PWORD pwCapInfo,
902 IN PWLAN_IE_SUPP_RATES pSuppRates, 902 PWLAN_IE_SUPP_RATES pSuppRates,
903 IN PWLAN_IE_SUPP_RATES pExtSuppRates 903 PWLAN_IE_SUPP_RATES pExtSuppRates
904 ) 904 )
905{ 905{
906 PSDevice pDevice = (PSDevice)hDeviceContext; 906 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -960,7 +960,7 @@ BSSvUpdateAPNode(
960 960
961void 961void
962BSSvAddMulticastNode( 962BSSvAddMulticastNode(
963 IN void *hDeviceContext 963 void *hDeviceContext
964 ) 964 )
965{ 965{
966 PSDevice pDevice = (PSDevice)hDeviceContext; 966 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1013,7 +1013,7 @@ UINT status;
1013#endif 1013#endif
1014void 1014void
1015BSSvSecondCallBack( 1015BSSvSecondCallBack(
1016 IN void *hDeviceContext 1016 void *hDeviceContext
1017 ) 1017 )
1018{ 1018{
1019 PSDevice pDevice = (PSDevice)hDeviceContext; 1019 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1390,11 +1390,11 @@ start:
1390 1390
1391void 1391void
1392BSSvUpdateNodeTxCounter( 1392BSSvUpdateNodeTxCounter(
1393 IN void *hDeviceContext, 1393 void *hDeviceContext,
1394 IN BYTE byTsr0, 1394 BYTE byTsr0,
1395 IN BYTE byTsr1, 1395 BYTE byTsr1,
1396 IN PBYTE pbyBuffer, 1396 PBYTE pbyBuffer,
1397 IN UINT uFIFOHeaderSize 1397 UINT uFIFOHeaderSize
1398 ) 1398 )
1399{ 1399{
1400 PSDevice pDevice = (PSDevice)hDeviceContext; 1400 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1583,8 +1583,8 @@ BSSvUpdateNodeTxCounter(
1583 1583
1584void 1584void
1585BSSvClearNodeDBTable( 1585BSSvClearNodeDBTable(
1586 IN void *hDeviceContext, 1586 void *hDeviceContext,
1587 IN UINT uStartIndex 1587 UINT uStartIndex
1588 ) 1588 )
1589 1589
1590{ 1590{
@@ -1611,7 +1611,7 @@ BSSvClearNodeDBTable(
1611 1611
1612 1612
1613void s_vCheckSensitivity( 1613void s_vCheckSensitivity(
1614 IN void *hDeviceContext 1614 void *hDeviceContext
1615 ) 1615 )
1616{ 1616{
1617 PSDevice pDevice = (PSDevice)hDeviceContext; 1617 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1661,7 +1661,7 @@ void s_vCheckSensitivity(
1661 1661
1662void 1662void
1663BSSvClearAnyBSSJoinRecord ( 1663BSSvClearAnyBSSJoinRecord (
1664 IN void *hDeviceContext 1664 void *hDeviceContext
1665 ) 1665 )
1666{ 1666{
1667 PSDevice pDevice = (PSDevice)hDeviceContext; 1667 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1676,7 +1676,7 @@ BSSvClearAnyBSSJoinRecord (
1676 1676
1677#ifdef Calcu_LinkQual 1677#ifdef Calcu_LinkQual
1678void s_uCalculateLinkQual( 1678void s_uCalculateLinkQual(
1679 IN void *hDeviceContext 1679 void *hDeviceContext
1680 ) 1680 )
1681{ 1681{
1682 PSDevice pDevice = (PSDevice)hDeviceContext; 1682 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1724,7 +1724,7 @@ else
1724#endif 1724#endif
1725 1725
1726void s_vCheckPreEDThreshold( 1726void s_vCheckPreEDThreshold(
1727 IN void *hDeviceContext 1727 void *hDeviceContext
1728 ) 1728 )
1729{ 1729{
1730 PSDevice pDevice = (PSDevice)hDeviceContext; 1730 PSDevice pDevice = (PSDevice)hDeviceContext;
diff --git a/drivers/staging/vt6655/bssdb.h b/drivers/staging/vt6655/bssdb.h
index a66e14f0a82..ec1e32bf35b 100644
--- a/drivers/staging/vt6655/bssdb.h
+++ b/drivers/staging/vt6655/bssdb.h
@@ -244,128 +244,128 @@ typedef struct tagKnownNodeDB {
244 244
245PKnownBSS 245PKnownBSS
246BSSpSearchBSSList( 246BSSpSearchBSSList(
247 IN void *hDeviceContext, 247 void *hDeviceContext,
248 IN PBYTE pbyDesireBSSID, 248 PBYTE pbyDesireBSSID,
249 IN PBYTE pbyDesireSSID, 249 PBYTE pbyDesireSSID,
250 IN CARD_PHY_TYPE ePhyType 250 CARD_PHY_TYPE ePhyType
251 ); 251 );
252 252
253PKnownBSS 253PKnownBSS
254BSSpAddrIsInBSSList( 254BSSpAddrIsInBSSList(
255 IN void *hDeviceContext, 255 void *hDeviceContext,
256 IN PBYTE abyBSSID, 256 PBYTE abyBSSID,
257 IN PWLAN_IE_SSID pSSID 257 PWLAN_IE_SSID pSSID
258 ); 258 );
259 259
260void 260void
261BSSvClearBSSList( 261BSSvClearBSSList(
262 IN void *hDeviceContext, 262 void *hDeviceContext,
263 IN BOOL bKeepCurrBSSID 263 BOOL bKeepCurrBSSID
264 ); 264 );
265 265
266BOOL 266BOOL
267BSSbInsertToBSSList( 267BSSbInsertToBSSList(
268 IN void *hDeviceContext, 268 void *hDeviceContext,
269 IN PBYTE abyBSSIDAddr, 269 PBYTE abyBSSIDAddr,
270 IN QWORD qwTimestamp, 270 QWORD qwTimestamp,
271 IN WORD wBeaconInterval, 271 WORD wBeaconInterval,
272 IN WORD wCapInfo, 272 WORD wCapInfo,
273 IN BYTE byCurrChannel, 273 BYTE byCurrChannel,
274 IN PWLAN_IE_SSID pSSID, 274 PWLAN_IE_SSID pSSID,
275 IN PWLAN_IE_SUPP_RATES pSuppRates, 275 PWLAN_IE_SUPP_RATES pSuppRates,
276 IN PWLAN_IE_SUPP_RATES pExtSuppRates, 276 PWLAN_IE_SUPP_RATES pExtSuppRates,
277 IN PERPObject psERP, 277 PERPObject psERP,
278 IN PWLAN_IE_RSN pRSN, 278 PWLAN_IE_RSN pRSN,
279 IN PWLAN_IE_RSN_EXT pRSNWPA, 279 PWLAN_IE_RSN_EXT pRSNWPA,
280 IN PWLAN_IE_COUNTRY pIE_Country, 280 PWLAN_IE_COUNTRY pIE_Country,
281 IN PWLAN_IE_QUIET pIE_Quiet, 281 PWLAN_IE_QUIET pIE_Quiet,
282 IN UINT uIELength, 282 UINT uIELength,
283 IN PBYTE pbyIEs, 283 PBYTE pbyIEs,
284 IN void *pRxPacketContext 284 void *pRxPacketContext
285 ); 285 );
286 286
287 287
288BOOL 288BOOL
289BSSbUpdateToBSSList( 289BSSbUpdateToBSSList(
290 IN void *hDeviceContext, 290 void *hDeviceContext,
291 IN QWORD qwTimestamp, 291 QWORD qwTimestamp,
292 IN WORD wBeaconInterval, 292 WORD wBeaconInterval,
293 IN WORD wCapInfo, 293 WORD wCapInfo,
294 IN BYTE byCurrChannel, 294 BYTE byCurrChannel,
295 IN BOOL bChannelHit, 295 BOOL bChannelHit,
296 IN PWLAN_IE_SSID pSSID, 296 PWLAN_IE_SSID pSSID,
297 IN PWLAN_IE_SUPP_RATES pSuppRates, 297 PWLAN_IE_SUPP_RATES pSuppRates,
298 IN PWLAN_IE_SUPP_RATES pExtSuppRates, 298 PWLAN_IE_SUPP_RATES pExtSuppRates,
299 IN PERPObject psERP, 299 PERPObject psERP,
300 IN PWLAN_IE_RSN pRSN, 300 PWLAN_IE_RSN pRSN,
301 IN PWLAN_IE_RSN_EXT pRSNWPA, 301 PWLAN_IE_RSN_EXT pRSNWPA,
302 IN PWLAN_IE_COUNTRY pIE_Country, 302 PWLAN_IE_COUNTRY pIE_Country,
303 IN PWLAN_IE_QUIET pIE_Quiet, 303 PWLAN_IE_QUIET pIE_Quiet,
304 IN PKnownBSS pBSSList, 304 PKnownBSS pBSSList,
305 IN UINT uIELength, 305 UINT uIELength,
306 IN PBYTE pbyIEs, 306 PBYTE pbyIEs,
307 IN void *pRxPacketContext 307 void *pRxPacketContext
308 ); 308 );
309 309
310 310
311BOOL 311BOOL
312BSSDBbIsSTAInNodeDB( 312BSSDBbIsSTAInNodeDB(
313 IN void *hDeviceContext, 313 void *hDeviceContext,
314 IN PBYTE abyDstAddr, 314 PBYTE abyDstAddr,
315 OUT PUINT puNodeIndex 315 OUT PUINT puNodeIndex
316 ); 316 );
317 317
318void 318void
319BSSvCreateOneNode( 319BSSvCreateOneNode(
320 IN void *hDeviceContext, 320 void *hDeviceContext,
321 OUT PUINT puNodeIndex 321 OUT PUINT puNodeIndex
322 ); 322 );
323 323
324void 324void
325BSSvUpdateAPNode( 325BSSvUpdateAPNode(
326 IN void *hDeviceContext, 326 void *hDeviceContext,
327 IN PWORD pwCapInfo, 327 PWORD pwCapInfo,
328 IN PWLAN_IE_SUPP_RATES pItemRates, 328 PWLAN_IE_SUPP_RATES pItemRates,
329 IN PWLAN_IE_SUPP_RATES pExtSuppRates 329 PWLAN_IE_SUPP_RATES pExtSuppRates
330 ); 330 );
331 331
332 332
333void 333void
334BSSvSecondCallBack( 334BSSvSecondCallBack(
335 IN void *hDeviceContext 335 void *hDeviceContext
336 ); 336 );
337 337
338 338
339void 339void
340BSSvUpdateNodeTxCounter( 340BSSvUpdateNodeTxCounter(
341 IN void *hDeviceContext, 341 void *hDeviceContext,
342 IN BYTE byTsr0, 342 BYTE byTsr0,
343 IN BYTE byTsr1, 343 BYTE byTsr1,
344 IN PBYTE pbyBuffer, 344 PBYTE pbyBuffer,
345 IN UINT uFIFOHeaderSize 345 UINT uFIFOHeaderSize
346 ); 346 );
347 347
348void 348void
349BSSvRemoveOneNode( 349BSSvRemoveOneNode(
350 IN void *hDeviceContext, 350 void *hDeviceContext,
351 IN UINT uNodeIndex 351 UINT uNodeIndex
352 ); 352 );
353 353
354void 354void
355BSSvAddMulticastNode( 355BSSvAddMulticastNode(
356 IN void *hDeviceContext 356 void *hDeviceContext
357 ); 357 );
358 358
359 359
360void 360void
361BSSvClearNodeDBTable( 361BSSvClearNodeDBTable(
362 IN void *hDeviceContext, 362 void *hDeviceContext,
363 IN UINT uStartIndex 363 UINT uStartIndex
364 ); 364 );
365 365
366void 366void
367BSSvClearAnyBSSJoinRecord( 367BSSvClearAnyBSSJoinRecord(
368 IN void *hDeviceContext 368 void *hDeviceContext
369 ); 369 );
370 370
371#endif //__BSSDB_H__ 371#endif //__BSSDB_H__
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index e767044ba0d..bc61ca912cb 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -425,8 +425,8 @@ SCountryTable ChannelRuleTab[CCODE_MAX+1] =
425static 425static
426void 426void
427s_vCaculateOFDMRParameter( 427s_vCaculateOFDMRParameter(
428 IN BYTE byRate, 428 BYTE byRate,
429 IN CARD_PHY_TYPE ePHYType, 429 CARD_PHY_TYPE ePHYType,
430 OUT PBYTE pbyTxRate, 430 OUT PBYTE pbyTxRate,
431 OUT PBYTE pbyRsvTime 431 OUT PBYTE pbyRsvTime
432 ); 432 );
@@ -498,8 +498,8 @@ exit:
498static 498static
499void 499void
500s_vCaculateOFDMRParameter ( 500s_vCaculateOFDMRParameter (
501 IN BYTE byRate, 501 BYTE byRate,
502 IN CARD_PHY_TYPE ePHYType, 502 CARD_PHY_TYPE ePHYType,
503 OUT PBYTE pbyTxRate, 503 OUT PBYTE pbyTxRate,
504 OUT PBYTE pbyRsvTime 504 OUT PBYTE pbyRsvTime
505 ) 505 )
@@ -1550,10 +1550,10 @@ BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID)
1550-*/ 1550-*/
1551BOOL 1551BOOL
1552CARDbAdd_PMKID_Candidate ( 1552CARDbAdd_PMKID_Candidate (
1553 IN void *pDeviceHandler, 1553 void *pDeviceHandler,
1554 IN PBYTE pbyBSSID, 1554 PBYTE pbyBSSID,
1555 IN BOOL bRSNCapExist, 1555 BOOL bRSNCapExist,
1556 IN WORD wRSNCap 1556 WORD wRSNCap
1557 ) 1557 )
1558{ 1558{
1559 PSDevice pDevice = (PSDevice) pDeviceHandler; 1559 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -1601,7 +1601,7 @@ CARDbAdd_PMKID_Candidate (
1601 1601
1602void * 1602void *
1603CARDpGetCurrentAddress ( 1603CARDpGetCurrentAddress (
1604 IN void *pDeviceHandler 1604 void *pDeviceHandler
1605 ) 1605 )
1606{ 1606{
1607 PSDevice pDevice = (PSDevice) pDeviceHandler; 1607 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -1708,9 +1708,9 @@ void CARDvInitChannelTable (void *pDeviceHandler)
1708-*/ 1708-*/
1709BOOL 1709BOOL
1710CARDbStartMeasure ( 1710CARDbStartMeasure (
1711 IN void *pDeviceHandler, 1711 void *pDeviceHandler,
1712 IN void *pvMeasureEIDs, 1712 void *pvMeasureEIDs,
1713 IN UINT uNumOfMeasureEIDs 1713 UINT uNumOfMeasureEIDs
1714 ) 1714 )
1715{ 1715{
1716 PSDevice pDevice = (PSDevice) pDeviceHandler; 1716 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -1835,10 +1835,10 @@ CARDbStartMeasure (
1835-*/ 1835-*/
1836BOOL 1836BOOL
1837CARDbChannelSwitch ( 1837CARDbChannelSwitch (
1838 IN void *pDeviceHandler, 1838 void *pDeviceHandler,
1839 IN BYTE byMode, 1839 BYTE byMode,
1840 IN BYTE byNewChannel, 1840 BYTE byNewChannel,
1841 IN BYTE byCount 1841 BYTE byCount
1842 ) 1842 )
1843{ 1843{
1844 PSDevice pDevice = (PSDevice) pDeviceHandler; 1844 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -1878,12 +1878,12 @@ CARDbChannelSwitch (
1878-*/ 1878-*/
1879BOOL 1879BOOL
1880CARDbSetQuiet ( 1880CARDbSetQuiet (
1881 IN void *pDeviceHandler, 1881 void *pDeviceHandler,
1882 IN BOOL bResetQuiet, 1882 BOOL bResetQuiet,
1883 IN BYTE byQuietCount, 1883 BYTE byQuietCount,
1884 IN BYTE byQuietPeriod, 1884 BYTE byQuietPeriod,
1885 IN WORD wQuietDuration, 1885 WORD wQuietDuration,
1886 IN WORD wQuietOffset 1886 WORD wQuietOffset
1887 ) 1887 )
1888{ 1888{
1889 PSDevice pDevice = (PSDevice) pDeviceHandler; 1889 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -1934,7 +1934,7 @@ CARDbSetQuiet (
1934-*/ 1934-*/
1935BOOL 1935BOOL
1936CARDbStartQuiet ( 1936CARDbStartQuiet (
1937 IN void *pDeviceHandler 1937 void *pDeviceHandler
1938 ) 1938 )
1939{ 1939{
1940 PSDevice pDevice = (PSDevice) pDeviceHandler; 1940 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2035,9 +2035,9 @@ CARDbStartQuiet (
2035-*/ 2035-*/
2036void 2036void
2037CARDvSetCountryInfo ( 2037CARDvSetCountryInfo (
2038 IN void *pDeviceHandler, 2038 void *pDeviceHandler,
2039 IN CARD_PHY_TYPE ePHYType, 2039 CARD_PHY_TYPE ePHYType,
2040 IN void *pIE 2040 void *pIE
2041 ) 2041 )
2042{ 2042{
2043 PSDevice pDevice = (PSDevice) pDeviceHandler; 2043 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2094,9 +2094,9 @@ CARDvSetCountryInfo (
2094-*/ 2094-*/
2095void 2095void
2096CARDvSetPowerConstraint ( 2096CARDvSetPowerConstraint (
2097 IN void *pDeviceHandler, 2097 void *pDeviceHandler,
2098 IN BYTE byChannel, 2098 BYTE byChannel,
2099 IN I8 byPower 2099 I8 byPower
2100 ) 2100 )
2101{ 2101{
2102 PSDevice pDevice = (PSDevice) pDeviceHandler; 2102 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2129,7 +2129,7 @@ CARDvSetPowerConstraint (
2129-*/ 2129-*/
2130void 2130void
2131CARDvGetPowerCapability ( 2131CARDvGetPowerCapability (
2132 IN void *pDeviceHandler, 2132 void *pDeviceHandler,
2133 OUT PBYTE pbyMinPower, 2133 OUT PBYTE pbyMinPower,
2134 OUT PBYTE pbyMaxPower 2134 OUT PBYTE pbyMaxPower
2135 ) 2135 )
@@ -2165,8 +2165,8 @@ CARDvGetPowerCapability (
2165-*/ 2165-*/
2166BYTE 2166BYTE
2167CARDbySetSupportChannels ( 2167CARDbySetSupportChannels (
2168 IN void *pDeviceHandler, 2168 void *pDeviceHandler,
2169 IN OUT PBYTE pbyIEs 2169 OUT PBYTE pbyIEs
2170 ) 2170 )
2171{ 2171{
2172 PSDevice pDevice = (PSDevice) pDeviceHandler; 2172 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2256,7 +2256,7 @@ CARDbySetSupportChannels (
2256-*/ 2256-*/
2257I8 2257I8
2258CARDbyGetTransmitPower ( 2258CARDbyGetTransmitPower (
2259 IN void *pDeviceHandler 2259 void *pDeviceHandler
2260 ) 2260 )
2261{ 2261{
2262 PSDevice pDevice = (PSDevice) pDeviceHandler; 2262 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2267,7 +2267,7 @@ CARDbyGetTransmitPower (
2267 2267
2268BOOL 2268BOOL
2269CARDbChannelGetList ( 2269CARDbChannelGetList (
2270 IN UINT uCountryCodeIdx, 2270 UINT uCountryCodeIdx,
2271 OUT PBYTE pbyChannelTable 2271 OUT PBYTE pbyChannelTable
2272 ) 2272 )
2273{ 2273{
@@ -2281,8 +2281,8 @@ CARDbChannelGetList (
2281 2281
2282void 2282void
2283CARDvSetCountryIE( 2283CARDvSetCountryIE(
2284 IN void *pDeviceHandler, 2284 void *pDeviceHandler,
2285 IN void *pIE 2285 void *pIE
2286 ) 2286 )
2287{ 2287{
2288 PSDevice pDevice = (PSDevice) pDeviceHandler; 2288 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2307,8 +2307,8 @@ CARDvSetCountryIE(
2307 2307
2308BOOL 2308BOOL
2309CARDbGetChannelMapInfo( 2309CARDbGetChannelMapInfo(
2310 IN void *pDeviceHandler, 2310 void *pDeviceHandler,
2311 IN UINT uChannelIndex, 2311 UINT uChannelIndex,
2312 OUT PBYTE pbyChannelNumber, 2312 OUT PBYTE pbyChannelNumber,
2313 OUT PBYTE pbyMap 2313 OUT PBYTE pbyMap
2314 ) 2314 )
@@ -2326,9 +2326,9 @@ CARDbGetChannelMapInfo(
2326 2326
2327void 2327void
2328CARDvSetChannelMapInfo( 2328CARDvSetChannelMapInfo(
2329 IN void *pDeviceHandler, 2329 void *pDeviceHandler,
2330 IN UINT uChannelIndex, 2330 UINT uChannelIndex,
2331 IN BYTE byMap 2331 BYTE byMap
2332 ) 2332 )
2333{ 2333{
2334// PSDevice pDevice = (PSDevice) pDeviceHandler; 2334// PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2342,7 +2342,7 @@ CARDvSetChannelMapInfo(
2342 2342
2343void 2343void
2344CARDvClearChannelMapInfo( 2344CARDvClearChannelMapInfo(
2345 IN void *pDeviceHandler 2345 void *pDeviceHandler
2346 ) 2346 )
2347{ 2347{
2348// PSDevice pDevice = (PSDevice) pDeviceHandler; 2348// PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2356,7 +2356,7 @@ CARDvClearChannelMapInfo(
2356 2356
2357BYTE 2357BYTE
2358CARDbyAutoChannelSelect( 2358CARDbyAutoChannelSelect(
2359 IN void *pDeviceHandler, 2359 void *pDeviceHandler,
2360 CARD_PHY_TYPE ePHYType 2360 CARD_PHY_TYPE ePHYType
2361 ) 2361 )
2362{ 2362{
@@ -2422,7 +2422,7 @@ CARDbyAutoChannelSelect(
2422//xxx 2422//xxx
2423void 2423void
2424CARDvSafeResetTx ( 2424CARDvSafeResetTx (
2425 IN void *pDeviceHandler 2425 void *pDeviceHandler
2426 ) 2426 )
2427{ 2427{
2428 PSDevice pDevice = (PSDevice) pDeviceHandler; 2428 PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -2478,7 +2478,7 @@ CARDvSafeResetTx (
2478-*/ 2478-*/
2479void 2479void
2480CARDvSafeResetRx ( 2480CARDvSafeResetRx (
2481 IN void *pDeviceHandler 2481 void *pDeviceHandler
2482 ) 2482 )
2483{ 2483{
2484 PSDevice pDevice = (PSDevice) pDeviceHandler; 2484 PSDevice pDevice = (PSDevice) pDeviceHandler;
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 2114e99b584..f52a8e0d48c 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -133,15 +133,15 @@ BOOL CARDbRemoveKey (void *pDeviceHandler, PBYTE pbyBSSID);
133 133
134BOOL 134BOOL
135CARDbAdd_PMKID_Candidate ( 135CARDbAdd_PMKID_Candidate (
136 IN void *pDeviceHandler, 136 void *pDeviceHandler,
137 IN PBYTE pbyBSSID, 137 PBYTE pbyBSSID,
138 IN BOOL bRSNCapExist, 138 BOOL bRSNCapExist,
139 IN WORD wRSNCap 139 WORD wRSNCap
140 ); 140 );
141 141
142void * 142void *
143CARDpGetCurrentAddress ( 143CARDpGetCurrentAddress (
144 IN void *pDeviceHandler 144 void *pDeviceHandler
145 ); 145 );
146 146
147 147
@@ -150,101 +150,101 @@ BYTE CARDbyGetChannelMapping(void *pDeviceHandler, BYTE byChannelNumber, CARD_PH
150 150
151BOOL 151BOOL
152CARDbStartMeasure ( 152CARDbStartMeasure (
153 IN void *pDeviceHandler, 153 void *pDeviceHandler,
154 IN void *pvMeasureEIDs, 154 void *pvMeasureEIDs,
155 IN UINT uNumOfMeasureEIDs 155 UINT uNumOfMeasureEIDs
156 ); 156 );
157 157
158BOOL 158BOOL
159CARDbChannelSwitch ( 159CARDbChannelSwitch (
160 IN void *pDeviceHandler, 160 void *pDeviceHandler,
161 IN BYTE byMode, 161 BYTE byMode,
162 IN BYTE byNewChannel, 162 BYTE byNewChannel,
163 IN BYTE byCount 163 BYTE byCount
164 ); 164 );
165 165
166BOOL 166BOOL
167CARDbSetQuiet ( 167CARDbSetQuiet (
168 IN void *pDeviceHandler, 168 void *pDeviceHandler,
169 IN BOOL bResetQuiet, 169 BOOL bResetQuiet,
170 IN BYTE byQuietCount, 170 BYTE byQuietCount,
171 IN BYTE byQuietPeriod, 171 BYTE byQuietPeriod,
172 IN WORD wQuietDuration, 172 WORD wQuietDuration,
173 IN WORD wQuietOffset 173 WORD wQuietOffset
174 ); 174 );
175 175
176BOOL 176BOOL
177CARDbStartQuiet ( 177CARDbStartQuiet (
178 IN void *pDeviceHandler 178 void *pDeviceHandler
179 ); 179 );
180 180
181void 181void
182CARDvSetCountryInfo ( 182CARDvSetCountryInfo (
183 IN void *pDeviceHandler, 183 void *pDeviceHandler,
184 IN CARD_PHY_TYPE ePHYType, 184 CARD_PHY_TYPE ePHYType,
185 IN void *pIE 185 void *pIE
186 ); 186 );
187 187
188void 188void
189CARDvSetPowerConstraint ( 189CARDvSetPowerConstraint (
190 IN void *pDeviceHandler, 190 void *pDeviceHandler,
191 IN BYTE byChannel, 191 BYTE byChannel,
192 IN I8 byPower 192 I8 byPower
193 ); 193 );
194 194
195void 195void
196CARDvGetPowerCapability ( 196CARDvGetPowerCapability (
197 IN void *pDeviceHandler, 197 void *pDeviceHandler,
198 OUT PBYTE pbyMinPower, 198 OUT PBYTE pbyMinPower,
199 OUT PBYTE pbyMaxPower 199 OUT PBYTE pbyMaxPower
200 ); 200 );
201 201
202BYTE 202BYTE
203CARDbySetSupportChannels ( 203CARDbySetSupportChannels (
204 IN void *pDeviceHandler, 204 void *pDeviceHandler,
205 IN OUT PBYTE pbyIEs 205 OUT PBYTE pbyIEs
206 ); 206 );
207 207
208I8 208I8
209CARDbyGetTransmitPower ( 209CARDbyGetTransmitPower (
210 IN void *pDeviceHandler 210 void *pDeviceHandler
211 ); 211 );
212 212
213BOOL 213BOOL
214CARDbChannelGetList ( 214CARDbChannelGetList (
215 IN UINT uCountryCodeIdx, 215 UINT uCountryCodeIdx,
216 OUT PBYTE pbyChannelTable 216 OUT PBYTE pbyChannelTable
217 ); 217 );
218 218
219void 219void
220CARDvSetCountryIE( 220CARDvSetCountryIE(
221 IN void *pDeviceHandler, 221 void *pDeviceHandler,
222 IN void *pIE 222 void *pIE
223 ); 223 );
224 224
225BOOL 225BOOL
226CARDbGetChannelMapInfo( 226CARDbGetChannelMapInfo(
227 IN void *pDeviceHandler, 227 void *pDeviceHandler,
228 IN UINT uChannelIndex, 228 UINT uChannelIndex,
229 OUT PBYTE pbyChannelNumber, 229 OUT PBYTE pbyChannelNumber,
230 OUT PBYTE pbyMap 230 OUT PBYTE pbyMap
231 ); 231 );
232 232
233void 233void
234CARDvSetChannelMapInfo( 234CARDvSetChannelMapInfo(
235 IN void *pDeviceHandler, 235 void *pDeviceHandler,
236 IN UINT uChannelIndex, 236 UINT uChannelIndex,
237 IN BYTE byMap 237 BYTE byMap
238 ); 238 );
239 239
240void 240void
241CARDvClearChannelMapInfo( 241CARDvClearChannelMapInfo(
242 IN void *pDeviceHandler 242 void *pDeviceHandler
243 ); 243 );
244 244
245BYTE 245BYTE
246CARDbyAutoChannelSelect( 246CARDbyAutoChannelSelect(
247 IN void *pDeviceHandler, 247 void *pDeviceHandler,
248 CARD_PHY_TYPE ePHYType 248 CARD_PHY_TYPE ePHYType
249 ); 249 );
250 250
diff --git a/drivers/staging/vt6655/datarate.c b/drivers/staging/vt6655/datarate.c
index e0d1a94f732..42b008a428d 100644
--- a/drivers/staging/vt6655/datarate.c
+++ b/drivers/staging/vt6655/datarate.c
@@ -65,14 +65,14 @@ const BYTE acbyIERate[MAX_RATE] =
65/*--------------------- Static Functions --------------------------*/ 65/*--------------------- Static Functions --------------------------*/
66 66
67void s_vResetCounter ( 67void s_vResetCounter (
68 IN PKnownNodeDB psNodeDBTable 68 PKnownNodeDB psNodeDBTable
69 ); 69 );
70 70
71 71
72 72
73void 73void
74s_vResetCounter ( 74s_vResetCounter (
75 IN PKnownNodeDB psNodeDBTable 75 PKnownNodeDB psNodeDBTable
76 ) 76 )
77{ 77{
78 BYTE ii; 78 BYTE ii;
@@ -106,7 +106,7 @@ s_vResetCounter (
106-*/ 106-*/
107BYTE 107BYTE
108DATARATEbyGetRateIdx ( 108DATARATEbyGetRateIdx (
109 IN BYTE byRate 109 BYTE byRate
110 ) 110 )
111{ 111{
112 BYTE ii; 112 BYTE ii;
@@ -160,7 +160,7 @@ DATARATEbyGetRateIdx (
160-*/ 160-*/
161WORD 161WORD
162wGetRateIdx( 162wGetRateIdx(
163 IN BYTE byRate 163 BYTE byRate
164 ) 164 )
165{ 165{
166 WORD ii; 166 WORD ii;
@@ -196,10 +196,10 @@ wGetRateIdx(
196-*/ 196-*/
197void 197void
198RATEvParseMaxRate ( 198RATEvParseMaxRate (
199 IN void *pDeviceHandler, 199 void *pDeviceHandler,
200 IN PWLAN_IE_SUPP_RATES pItemRates, 200 PWLAN_IE_SUPP_RATES pItemRates,
201 IN PWLAN_IE_SUPP_RATES pItemExtRates, 201 PWLAN_IE_SUPP_RATES pItemExtRates,
202 IN BOOL bUpdateBasicRate, 202 BOOL bUpdateBasicRate,
203 OUT PWORD pwMaxBasicRate, 203 OUT PWORD pwMaxBasicRate,
204 OUT PWORD pwMaxSuppRate, 204 OUT PWORD pwMaxSuppRate,
205 OUT PWORD pwSuppRate, 205 OUT PWORD pwSuppRate,
@@ -309,8 +309,8 @@ UINT uRateLen;
309 309
310void 310void
311RATEvTxRateFallBack ( 311RATEvTxRateFallBack (
312 IN void *pDeviceHandler, 312 void *pDeviceHandler,
313 IN PKnownNodeDB psNodeDBTable 313 PKnownNodeDB psNodeDBTable
314 ) 314 )
315{ 315{
316PSDevice pDevice = (PSDevice) pDeviceHandler; 316PSDevice pDevice = (PSDevice) pDeviceHandler;
@@ -411,9 +411,9 @@ TxRate_iwconfig=psNodeDBTable->wTxDataRate;
411-*/ 411-*/
412BYTE 412BYTE
413RATEuSetIE ( 413RATEuSetIE (
414 IN PWLAN_IE_SUPP_RATES pSrcRates, 414 PWLAN_IE_SUPP_RATES pSrcRates,
415 IN PWLAN_IE_SUPP_RATES pDstRates, 415 PWLAN_IE_SUPP_RATES pDstRates,
416 IN UINT uRateLen 416 UINT uRateLen
417 ) 417 )
418{ 418{
419 UINT ii, uu, uRateCnt = 0; 419 UINT ii, uu, uRateCnt = 0;
diff --git a/drivers/staging/vt6655/datarate.h b/drivers/staging/vt6655/datarate.h
index bba4a16d004..abf7a3884fc 100644
--- a/drivers/staging/vt6655/datarate.h
+++ b/drivers/staging/vt6655/datarate.h
@@ -56,10 +56,10 @@
56 56
57void 57void
58RATEvParseMaxRate( 58RATEvParseMaxRate(
59 IN void *pDeviceHandler, 59 void *pDeviceHandler,
60 IN PWLAN_IE_SUPP_RATES pItemRates, 60 PWLAN_IE_SUPP_RATES pItemRates,
61 IN PWLAN_IE_SUPP_RATES pItemExtRates, 61 PWLAN_IE_SUPP_RATES pItemExtRates,
62 IN BOOL bUpdateBasicRate, 62 BOOL bUpdateBasicRate,
63 OUT PWORD pwMaxBasicRate, 63 OUT PWORD pwMaxBasicRate,
64 OUT PWORD pwMaxSuppRate, 64 OUT PWORD pwMaxSuppRate,
65 OUT PWORD pwSuppRate, 65 OUT PWORD pwSuppRate,
@@ -69,26 +69,26 @@ RATEvParseMaxRate(
69 69
70void 70void
71RATEvTxRateFallBack( 71RATEvTxRateFallBack(
72 IN void *pDeviceHandler, 72 void *pDeviceHandler,
73 IN PKnownNodeDB psNodeDBTable 73 PKnownNodeDB psNodeDBTable
74 ); 74 );
75 75
76BYTE 76BYTE
77RATEuSetIE( 77RATEuSetIE(
78 IN PWLAN_IE_SUPP_RATES pSrcRates, 78 PWLAN_IE_SUPP_RATES pSrcRates,
79 IN PWLAN_IE_SUPP_RATES pDstRates, 79 PWLAN_IE_SUPP_RATES pDstRates,
80 IN UINT uRateLen 80 UINT uRateLen
81 ); 81 );
82 82
83WORD 83WORD
84wGetRateIdx( 84wGetRateIdx(
85 IN BYTE byRate 85 BYTE byRate
86 ); 86 );
87 87
88 88
89BYTE 89BYTE
90DATARATEbyGetRateIdx( 90DATARATEbyGetRateIdx(
91 IN BYTE byRate 91 BYTE byRate
92 ); 92 );
93 93
94 94
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 454277b96ee..a401f2ad62c 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -478,7 +478,7 @@ pDevice->bUpdateBBVGA = TRUE;
478 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(INT)pDevice->bDiversityRegCtlON); 478 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pDevice->bDiversityRegCtlON= %d\n",(INT)pDevice->bDiversityRegCtlON);
479} 479}
480 480
481static void s_vCompleteCurrentMeasure (IN PSDevice pDevice, IN BYTE byResult) 481static void s_vCompleteCurrentMeasure (PSDevice pDevice, BYTE byResult)
482{ 482{
483 UINT ii; 483 UINT ii;
484 DWORD dwDuration = 0; 484 DWORD dwDuration = 0;
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index d90104a1e6b..69368392466 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -76,13 +76,13 @@ const BYTE acbyRxRate[MAX_RATE] =
76 76
77/*--------------------- Static Functions --------------------------*/ 77/*--------------------- Static Functions --------------------------*/
78 78
79static BYTE s_byGetRateIdx(IN BYTE byRate); 79static BYTE s_byGetRateIdx(BYTE byRate);
80 80
81 81
82static 82static
83void 83void
84s_vGetDASA( 84s_vGetDASA(
85 IN PBYTE pbyRxBufferAddr, 85 PBYTE pbyRxBufferAddr,
86 OUT PUINT pcbHeaderSize, 86 OUT PUINT pcbHeaderSize,
87 OUT PSEthernetHeader psEthHeader 87 OUT PSEthernetHeader psEthHeader
88 ); 88 );
@@ -90,37 +90,37 @@ s_vGetDASA(
90static 90static
91void 91void
92s_vProcessRxMACHeader ( 92s_vProcessRxMACHeader (
93 IN PSDevice pDevice, 93 PSDevice pDevice,
94 IN PBYTE pbyRxBufferAddr, 94 PBYTE pbyRxBufferAddr,
95 IN UINT cbPacketSize, 95 UINT cbPacketSize,
96 IN BOOL bIsWEP, 96 BOOL bIsWEP,
97 IN BOOL bExtIV, 97 BOOL bExtIV,
98 OUT PUINT pcbHeadSize 98 OUT PUINT pcbHeadSize
99 ); 99 );
100 100
101static BOOL s_bAPModeRxCtl( 101static BOOL s_bAPModeRxCtl(
102 IN PSDevice pDevice, 102 PSDevice pDevice,
103 IN PBYTE pbyFrame, 103 PBYTE pbyFrame,
104 IN INT iSANodeIndex 104 INT iSANodeIndex
105 ); 105 );
106 106
107 107
108 108
109static BOOL s_bAPModeRxData ( 109static BOOL s_bAPModeRxData (
110 IN PSDevice pDevice, 110 PSDevice pDevice,
111 IN struct sk_buff* skb, 111 struct sk_buff* skb,
112 IN UINT FrameSize, 112 UINT FrameSize,
113 IN UINT cbHeaderOffset, 113 UINT cbHeaderOffset,
114 IN INT iSANodeIndex, 114 INT iSANodeIndex,
115 IN INT iDANodeIndex 115 INT iDANodeIndex
116 ); 116 );
117 117
118 118
119static BOOL s_bHandleRxEncryption( 119static BOOL s_bHandleRxEncryption(
120 IN PSDevice pDevice, 120 PSDevice pDevice,
121 IN PBYTE pbyFrame, 121 PBYTE pbyFrame,
122 IN UINT FrameSize, 122 UINT FrameSize,
123 IN PBYTE pbyRsr, 123 PBYTE pbyRsr,
124 OUT PBYTE pbyNewRsr, 124 OUT PBYTE pbyNewRsr,
125 OUT PSKeyItem *pKeyOut, 125 OUT PSKeyItem *pKeyOut,
126 int * pbExtIV, 126 int * pbExtIV,
@@ -130,12 +130,12 @@ static BOOL s_bHandleRxEncryption(
130 130
131static BOOL s_bHostWepRxEncryption( 131static BOOL s_bHostWepRxEncryption(
132 132
133 IN PSDevice pDevice, 133 PSDevice pDevice,
134 IN PBYTE pbyFrame, 134 PBYTE pbyFrame,
135 IN UINT FrameSize, 135 UINT FrameSize,
136 IN PBYTE pbyRsr, 136 PBYTE pbyRsr,
137 IN BOOL bOnFly, 137 BOOL bOnFly,
138 IN PSKeyItem pKey, 138 PSKeyItem pKey,
139 OUT PBYTE pbyNewRsr, 139 OUT PBYTE pbyNewRsr,
140 int * pbExtIV, 140 int * pbExtIV,
141 OUT PWORD pwRxTSC15_0, 141 OUT PWORD pwRxTSC15_0,
@@ -165,11 +165,11 @@ static BOOL s_bHostWepRxEncryption(
165static 165static
166void 166void
167s_vProcessRxMACHeader ( 167s_vProcessRxMACHeader (
168 IN PSDevice pDevice, 168 PSDevice pDevice,
169 IN PBYTE pbyRxBufferAddr, 169 PBYTE pbyRxBufferAddr,
170 IN UINT cbPacketSize, 170 UINT cbPacketSize,
171 IN BOOL bIsWEP, 171 BOOL bIsWEP,
172 IN BOOL bExtIV, 172 BOOL bExtIV,
173 OUT PUINT pcbHeadSize 173 OUT PUINT pcbHeadSize
174 ) 174 )
175{ 175{
@@ -249,7 +249,7 @@ s_vProcessRxMACHeader (
249 249
250 250
251 251
252static BYTE s_byGetRateIdx (IN BYTE byRate) 252static BYTE s_byGetRateIdx (BYTE byRate)
253{ 253{
254 BYTE byRateIdx; 254 BYTE byRateIdx;
255 255
@@ -264,7 +264,7 @@ static BYTE s_byGetRateIdx (IN BYTE byRate)
264static 264static
265void 265void
266s_vGetDASA ( 266s_vGetDASA (
267 IN PBYTE pbyRxBufferAddr, 267 PBYTE pbyRxBufferAddr,
268 OUT PUINT pcbHeaderSize, 268 OUT PUINT pcbHeaderSize,
269 OUT PSEthernetHeader psEthHeader 269 OUT PSEthernetHeader psEthHeader
270 ) 270 )
@@ -335,8 +335,8 @@ void MngWorkItem(void *Context)
335 335
336BOOL 336BOOL
337device_receive_frame ( 337device_receive_frame (
338 IN PSDevice pDevice, 338 PSDevice pDevice,
339 IN PSRxDesc pCurrRD 339 PSRxDesc pCurrRD
340 ) 340 )
341{ 341{
342 342
@@ -1039,9 +1039,9 @@ device_receive_frame (
1039 1039
1040 1040
1041static BOOL s_bAPModeRxCtl ( 1041static BOOL s_bAPModeRxCtl (
1042 IN PSDevice pDevice, 1042 PSDevice pDevice,
1043 IN PBYTE pbyFrame, 1043 PBYTE pbyFrame,
1044 IN INT iSANodeIndex 1044 INT iSANodeIndex
1045 ) 1045 )
1046{ 1046{
1047 PS802_11Header p802_11Header; 1047 PS802_11Header p802_11Header;
@@ -1163,10 +1163,10 @@ static BOOL s_bAPModeRxCtl (
1163} 1163}
1164 1164
1165static BOOL s_bHandleRxEncryption ( 1165static BOOL s_bHandleRxEncryption (
1166 IN PSDevice pDevice, 1166 PSDevice pDevice,
1167 IN PBYTE pbyFrame, 1167 PBYTE pbyFrame,
1168 IN UINT FrameSize, 1168 UINT FrameSize,
1169 IN PBYTE pbyRsr, 1169 PBYTE pbyRsr,
1170 OUT PBYTE pbyNewRsr, 1170 OUT PBYTE pbyNewRsr,
1171 OUT PSKeyItem *pKeyOut, 1171 OUT PSKeyItem *pKeyOut,
1172 int * pbExtIV, 1172 int * pbExtIV,
@@ -1309,12 +1309,12 @@ static BOOL s_bHandleRxEncryption (
1309 1309
1310 1310
1311static BOOL s_bHostWepRxEncryption ( 1311static BOOL s_bHostWepRxEncryption (
1312 IN PSDevice pDevice, 1312 PSDevice pDevice,
1313 IN PBYTE pbyFrame, 1313 PBYTE pbyFrame,
1314 IN UINT FrameSize, 1314 UINT FrameSize,
1315 IN PBYTE pbyRsr, 1315 PBYTE pbyRsr,
1316 IN BOOL bOnFly, 1316 BOOL bOnFly,
1317 IN PSKeyItem pKey, 1317 PSKeyItem pKey,
1318 OUT PBYTE pbyNewRsr, 1318 OUT PBYTE pbyNewRsr,
1319 int * pbExtIV, 1319 int * pbExtIV,
1320 OUT PWORD pwRxTSC15_0, 1320 OUT PWORD pwRxTSC15_0,
@@ -1440,12 +1440,12 @@ static BOOL s_bHostWepRxEncryption (
1440 1440
1441 1441
1442static BOOL s_bAPModeRxData ( 1442static BOOL s_bAPModeRxData (
1443 IN PSDevice pDevice, 1443 PSDevice pDevice,
1444 IN struct sk_buff* skb, 1444 struct sk_buff* skb,
1445 IN UINT FrameSize, 1445 UINT FrameSize,
1446 IN UINT cbHeaderOffset, 1446 UINT cbHeaderOffset,
1447 IN INT iSANodeIndex, 1447 INT iSANodeIndex,
1448 IN INT iDANodeIndex 1448 INT iDANodeIndex
1449 ) 1449 )
1450{ 1450{
1451 PSMgmtObject pMgmt = pDevice->pMgmt; 1451 PSMgmtObject pMgmt = pDevice->pMgmt;
diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h
index 4129c11e011..e574963fee0 100644
--- a/drivers/staging/vt6655/dpc.h
+++ b/drivers/staging/vt6655/dpc.h
@@ -43,8 +43,8 @@
43 43
44BOOL 44BOOL
45device_receive_frame ( 45device_receive_frame (
46 IN PSDevice pDevice, 46 PSDevice pDevice,
47 IN PSRxDesc pCurrRD 47 PSRxDesc pCurrRD
48 ); 48 );
49 49
50void MngWorkItem(void *Context); 50void MngWorkItem(void *Context);
diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
index 1bd819946b8..e36cd30f642 100644
--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@@ -716,10 +716,10 @@ if(wpa_Result.authenticated==TRUE) {
716/* 716/*
717void 717void
718vConfigWEPKey ( 718vConfigWEPKey (
719 IN PSDevice pDevice, 719 PSDevice pDevice,
720 IN DWORD dwKeyIndex, 720 DWORD dwKeyIndex,
721 IN PBYTE pbyKey, 721 PBYTE pbyKey,
722 IN ULONG uKeyLength 722 ULONG uKeyLength
723 ) 723 )
724{ 724{
725 int ii; 725 int ii;
diff --git a/drivers/staging/vt6655/ioctl.h b/drivers/staging/vt6655/ioctl.h
index dc278aeb7ea..0d10c2a923c 100644
--- a/drivers/staging/vt6655/ioctl.h
+++ b/drivers/staging/vt6655/ioctl.h
@@ -44,10 +44,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq);
44 44
45/* 45/*
46void vConfigWEPKey ( 46void vConfigWEPKey (
47 IN PSDevice pDevice, 47 PSDevice pDevice,
48 IN DWORD dwKeyIndex, 48 DWORD dwKeyIndex,
49 IN PBYTE pbyKey, 49 PBYTE pbyKey,
50 IN ULONG uKeyLength 50 ULONG uKeyLength
51 ); 51 );
52*/ 52*/
53 53
diff --git a/drivers/staging/vt6655/key.c b/drivers/staging/vt6655/key.c
index b40c400a23c..c702d509605 100644
--- a/drivers/staging/vt6655/key.c
+++ b/drivers/staging/vt6655/key.c
@@ -132,9 +132,9 @@ void KeyvInitTable (PSKeyManagement pTable, DWORD_PTR dwIoBase)
132 * 132 *
133 */ 133 */
134BOOL KeybGetKey ( 134BOOL KeybGetKey (
135 IN PSKeyManagement pTable, 135 PSKeyManagement pTable,
136 IN PBYTE pbyBSSID, 136 PBYTE pbyBSSID,
137 IN DWORD dwKeyIndex, 137 DWORD dwKeyIndex,
138 OUT PSKeyItem *pKey 138 OUT PSKeyItem *pKey
139 ) 139 )
140{ 140{
@@ -518,9 +518,9 @@ void KeyvRemoveAllWEPKey (
518 * 518 *
519 */ 519 */
520BOOL KeybGetTransmitKey ( 520BOOL KeybGetTransmitKey (
521 IN PSKeyManagement pTable, 521 PSKeyManagement pTable,
522 IN PBYTE pbyBSSID, 522 PBYTE pbyBSSID,
523 IN DWORD dwKeyType, 523 DWORD dwKeyType,
524 OUT PSKeyItem *pKey 524 OUT PSKeyItem *pKey
525 ) 525 )
526{ 526{
@@ -598,7 +598,7 @@ BOOL KeybGetTransmitKey (
598 * 598 *
599 */ 599 */
600BOOL KeybCheckPairewiseKey ( 600BOOL KeybCheckPairewiseKey (
601 IN PSKeyManagement pTable, 601 PSKeyManagement pTable,
602 OUT PSKeyItem *pKey 602 OUT PSKeyItem *pKey
603 ) 603 )
604{ 604{
diff --git a/drivers/staging/vt6655/key.h b/drivers/staging/vt6655/key.h
index 4cbd82f76e4..88be5b4f392 100644
--- a/drivers/staging/vt6655/key.h
+++ b/drivers/staging/vt6655/key.h
@@ -104,9 +104,9 @@ typedef struct tagSKeyManagement
104void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase); 104void KeyvInitTable(PSKeyManagement pTable, DWORD_PTR dwIoBase);
105 105
106BOOL KeybGetKey( 106BOOL KeybGetKey(
107 IN PSKeyManagement pTable, 107 PSKeyManagement pTable,
108 IN PBYTE pbyBSSID, 108 PBYTE pbyBSSID,
109 IN DWORD dwKeyIndex, 109 DWORD dwKeyIndex,
110 OUT PSKeyItem *pKey 110 OUT PSKeyItem *pKey
111 ); 111 );
112 112
@@ -141,14 +141,14 @@ BOOL KeybRemoveKey(
141 ); 141 );
142 142
143BOOL KeybGetTransmitKey( 143BOOL KeybGetTransmitKey(
144 IN PSKeyManagement pTable, 144 PSKeyManagement pTable,
145 IN PBYTE pbyBSSID, 145 PBYTE pbyBSSID,
146 IN DWORD dwKeyType, 146 DWORD dwKeyType,
147 OUT PSKeyItem *pKey 147 OUT PSKeyItem *pKey
148 ); 148 );
149 149
150BOOL KeybCheckPairewiseKey( 150BOOL KeybCheckPairewiseKey(
151 IN PSKeyManagement pTable, 151 PSKeyManagement pTable,
152 OUT PSKeyItem *pKey 152 OUT PSKeyItem *pKey
153 ); 153 );
154 154
diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index 166e7fb638c..64c22c3e4bb 100644
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -76,8 +76,8 @@ static int msglevel =MSG_LEVEL_INFO;
76 76
77void 77void
78PSvEnablePowerSaving( 78PSvEnablePowerSaving(
79 IN void *hDeviceContext, 79 void *hDeviceContext,
80 IN WORD wListenInterval 80 WORD wListenInterval
81 ) 81 )
82{ 82{
83 PSDevice pDevice = (PSDevice)hDeviceContext; 83 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -118,7 +118,7 @@ PSvEnablePowerSaving(
118 pDevice->bEnablePSMode = TRUE; 118 pDevice->bEnablePSMode = TRUE;
119 119
120 if (pDevice->eOPMode == OP_MODE_ADHOC) { 120 if (pDevice->eOPMode == OP_MODE_ADHOC) {
121// bMgrPrepareBeaconToSend((HANDLE)pDevice, pMgmt); 121// bMgrPrepareBeaconToSend((void *)pDevice, pMgmt);
122 } 122 }
123 // We don't send null pkt in ad hoc mode since beacon will handle this. 123 // We don't send null pkt in ad hoc mode since beacon will handle this.
124 else if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) { 124 else if (pDevice->eOPMode == OP_MODE_INFRASTRUCTURE) {
@@ -146,7 +146,7 @@ PSvEnablePowerSaving(
146 146
147void 147void
148PSvDisablePowerSaving( 148PSvDisablePowerSaving(
149 IN void *hDeviceContext 149 void *hDeviceContext
150 ) 150 )
151{ 151{
152 PSDevice pDevice = (PSDevice)hDeviceContext; 152 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -184,9 +184,9 @@ PSvDisablePowerSaving(
184 184
185BOOL 185BOOL
186PSbConsiderPowerDown( 186PSbConsiderPowerDown(
187 IN void *hDeviceContext, 187 void *hDeviceContext,
188 IN BOOL bCheckRxDMA, 188 BOOL bCheckRxDMA,
189 IN BOOL bCheckCountToWakeUp 189 BOOL bCheckCountToWakeUp
190 ) 190 )
191{ 191{
192 PSDevice pDevice = (PSDevice)hDeviceContext; 192 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -252,7 +252,7 @@ PSbConsiderPowerDown(
252 252
253void 253void
254PSvSendPSPOLL( 254PSvSendPSPOLL(
255 IN void *hDeviceContext 255 void *hDeviceContext
256 ) 256 )
257{ 257{
258 PSDevice pDevice = (PSDevice)hDeviceContext; 258 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -298,7 +298,7 @@ PSvSendPSPOLL(
298-*/ 298-*/
299BOOL 299BOOL
300PSbSendNullPacket( 300PSbSendNullPacket(
301 IN void *hDeviceContext 301 void *hDeviceContext
302 ) 302 )
303{ 303{
304 PSDevice pDevice = (PSDevice)hDeviceContext; 304 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -384,7 +384,7 @@ PSbSendNullPacket(
384 384
385BOOL 385BOOL
386PSbIsNextTBTTWakeUp( 386PSbIsNextTBTTWakeUp(
387 IN void *hDeviceContext 387 void *hDeviceContext
388 ) 388 )
389{ 389{
390 390
diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h
index 769e0d1acd2..c0dbe216e97 100644
--- a/drivers/staging/vt6655/power.h
+++ b/drivers/staging/vt6655/power.h
@@ -45,40 +45,40 @@
45 45
46/*--------------------- Export Functions --------------------------*/ 46/*--------------------- Export Functions --------------------------*/
47 47
48// IN PSDevice pDevice 48// PSDevice pDevice
49// IN PSDevice hDeviceContext 49// PSDevice hDeviceContext
50 50
51BOOL 51BOOL
52PSbConsiderPowerDown( 52PSbConsiderPowerDown(
53 IN void *hDeviceContext, 53 void *hDeviceContext,
54 IN BOOL bCheckRxDMA, 54 BOOL bCheckRxDMA,
55 IN BOOL bCheckCountToWakeUp 55 BOOL bCheckCountToWakeUp
56 ); 56 );
57 57
58void 58void
59PSvDisablePowerSaving( 59PSvDisablePowerSaving(
60 IN void *hDeviceContext 60 void *hDeviceContext
61 ); 61 );
62 62
63void 63void
64PSvEnablePowerSaving( 64PSvEnablePowerSaving(
65 IN void *hDeviceContext, 65 void *hDeviceContext,
66 IN WORD wListenInterval 66 WORD wListenInterval
67 ); 67 );
68 68
69void 69void
70PSvSendPSPOLL( 70PSvSendPSPOLL(
71 IN void *hDeviceContext 71 void *hDeviceContext
72 ); 72 );
73 73
74BOOL 74BOOL
75PSbSendNullPacket( 75PSbSendNullPacket(
76 IN void *hDeviceContext 76 void *hDeviceContext
77 ); 77 );
78 78
79BOOL 79BOOL
80PSbIsNextTBTTWakeUp( 80PSbIsNextTBTTWakeUp(
81 IN void *hDeviceContext 81 void *hDeviceContext
82 ); 82 );
83 83
84#endif //__POWER_H__ 84#endif //__POWER_H__
diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c
index 29eb758c9e7..7cb86fe2eeb 100644
--- a/drivers/staging/vt6655/rf.c
+++ b/drivers/staging/vt6655/rf.c
@@ -808,7 +808,7 @@ BOOL RFbAL2230SelectChannel (DWORD_PTR dwIoBase, BYTE byChannel)
808 * 808 *
809 */ 809 */
810BOOL RFbInit ( 810BOOL RFbInit (
811 IN PSDevice pDevice 811 PSDevice pDevice
812 ) 812 )
813{ 813{
814BOOL bResult = TRUE; 814BOOL bResult = TRUE;
@@ -846,7 +846,7 @@ BOOL bResult = TRUE;
846 * 846 *
847 */ 847 */
848BOOL RFbShutDown ( 848BOOL RFbShutDown (
849 IN PSDevice pDevice 849 PSDevice pDevice
850 ) 850 )
851{ 851{
852BOOL bResult = TRUE; 852BOOL bResult = TRUE;
@@ -997,9 +997,9 @@ BOOL RFvWriteWakeProgSyn (DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel)
997 * 997 *
998 */ 998 */
999BOOL RFbSetPower ( 999BOOL RFbSetPower (
1000 IN PSDevice pDevice, 1000 PSDevice pDevice,
1001 IN UINT uRATE, 1001 UINT uRATE,
1002 IN UINT uCH 1002 UINT uCH
1003 ) 1003 )
1004{ 1004{
1005BOOL bResult = TRUE; 1005BOOL bResult = TRUE;
@@ -1136,9 +1136,9 @@ BYTE byPwrdBm = 0;
1136 */ 1136 */
1137 1137
1138BOOL RFbRawSetPower ( 1138BOOL RFbRawSetPower (
1139 IN PSDevice pDevice, 1139 PSDevice pDevice,
1140 IN BYTE byPwr, 1140 BYTE byPwr,
1141 IN UINT uRATE 1141 UINT uRATE
1142 ) 1142 )
1143{ 1143{
1144BOOL bResult = TRUE; 1144BOOL bResult = TRUE;
@@ -1203,8 +1203,8 @@ DWORD dwMax7230Pwr = 0;
1203-*/ 1203-*/
1204void 1204void
1205RFvRSSITodBm ( 1205RFvRSSITodBm (
1206 IN PSDevice pDevice, 1206 PSDevice pDevice,
1207 IN BYTE byCurrRSSI, 1207 BYTE byCurrRSSI,
1208 long * pldBm 1208 long * pldBm
1209 ) 1209 )
1210{ 1210{
diff --git a/drivers/staging/vt6655/rf.h b/drivers/staging/vt6655/rf.h
index e6e6ca58633..25dfc7942f6 100644
--- a/drivers/staging/vt6655/rf.h
+++ b/drivers/staging/vt6655/rf.h
@@ -79,20 +79,20 @@
79BOOL IFRFbWriteEmbeded(DWORD_PTR dwIoBase, DWORD dwData); 79BOOL IFRFbWriteEmbeded(DWORD_PTR dwIoBase, DWORD dwData);
80BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel); 80BOOL RFbSelectChannel(DWORD_PTR dwIoBase, BYTE byRFType, BYTE byChannel);
81BOOL RFbInit ( 81BOOL RFbInit (
82 IN PSDevice pDevice 82 PSDevice pDevice
83 ); 83 );
84BOOL RFvWriteWakeProgSyn(DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel); 84BOOL RFvWriteWakeProgSyn(DWORD_PTR dwIoBase, BYTE byRFType, UINT uChannel);
85BOOL RFbSetPower(PSDevice pDevice, UINT uRATE, UINT uCH); 85BOOL RFbSetPower(PSDevice pDevice, UINT uRATE, UINT uCH);
86BOOL RFbRawSetPower( 86BOOL RFbRawSetPower(
87 IN PSDevice pDevice, 87 PSDevice pDevice,
88 IN BYTE byPwr, 88 BYTE byPwr,
89 IN UINT uRATE 89 UINT uRATE
90 ); 90 );
91 91
92void 92void
93RFvRSSITodBm( 93RFvRSSITodBm(
94 IN PSDevice pDevice, 94 PSDevice pDevice,
95 IN BYTE byCurrRSSI, 95 BYTE byCurrRSSI,
96 long *pldBm 96 long *pldBm
97 ); 97 );
98 98
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 8d1772e70ab..885741a774b 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -117,12 +117,12 @@ const WORD wFB_Opt1[2][5] = {
117static 117static
118void 118void
119s_vFillTxKey( 119s_vFillTxKey(
120 IN PSDevice pDevice, 120 PSDevice pDevice,
121 IN PBYTE pbyBuf, 121 PBYTE pbyBuf,
122 IN PBYTE pbyIVHead, 122 PBYTE pbyIVHead,
123 IN PSKeyItem pTransmitKey, 123 PSKeyItem pTransmitKey,
124 IN PBYTE pbyHdrBuf, 124 PBYTE pbyHdrBuf,
125 IN WORD wPayloadLen, 125 WORD wPayloadLen,
126 OUT PBYTE pMICHDR 126 OUT PBYTE pMICHDR
127 ); 127 );
128 128
@@ -131,59 +131,59 @@ s_vFillTxKey(
131static 131static
132void 132void
133s_vFillRTSHead( 133s_vFillRTSHead(
134 IN PSDevice pDevice, 134 PSDevice pDevice,
135 IN BYTE byPktType, 135 BYTE byPktType,
136 IN void * pvRTS, 136 void * pvRTS,
137 IN UINT cbFrameLength, 137 UINT cbFrameLength,
138 IN BOOL bNeedAck, 138 BOOL bNeedAck,
139 IN BOOL bDisCRC, 139 BOOL bDisCRC,
140 IN PSEthernetHeader psEthHeader, 140 PSEthernetHeader psEthHeader,
141 IN WORD wCurrentRate, 141 WORD wCurrentRate,
142 IN BYTE byFBOption 142 BYTE byFBOption
143 ); 143 );
144 144
145static 145static
146void 146void
147s_vGenerateTxParameter( 147s_vGenerateTxParameter(
148 IN PSDevice pDevice, 148 PSDevice pDevice,
149 IN BYTE byPktType, 149 BYTE byPktType,
150 IN void * pTxBufHead, 150 void * pTxBufHead,
151 IN void * pvRrvTime, 151 void * pvRrvTime,
152 IN void * pvRTS, 152 void * pvRTS,
153 IN void * pvCTS, 153 void * pvCTS,
154 IN UINT cbFrameSize, 154 UINT cbFrameSize,
155 IN BOOL bNeedACK, 155 BOOL bNeedACK,
156 IN UINT uDMAIdx, 156 UINT uDMAIdx,
157 IN PSEthernetHeader psEthHeader, 157 PSEthernetHeader psEthHeader,
158 IN WORD wCurrentRate 158 WORD wCurrentRate
159 ); 159 );
160 160
161 161
162 162
163static void s_vFillFragParameter( 163static void s_vFillFragParameter(
164 IN PSDevice pDevice, 164 PSDevice pDevice,
165 IN PBYTE pbyBuffer, 165 PBYTE pbyBuffer,
166 IN UINT uTxType, 166 UINT uTxType,
167 IN void * pvtdCurr, 167 void * pvtdCurr,
168 IN WORD wFragType, 168 WORD wFragType,
169 IN UINT cbReqCount 169 UINT cbReqCount
170 ); 170 );
171 171
172 172
173static 173static
174UINT 174UINT
175s_cbFillTxBufHead ( 175s_cbFillTxBufHead (
176 IN PSDevice pDevice, 176 PSDevice pDevice,
177 IN BYTE byPktType, 177 BYTE byPktType,
178 IN PBYTE pbyTxBufferAddr, 178 PBYTE pbyTxBufferAddr,
179 IN UINT cbFrameBodySize, 179 UINT cbFrameBodySize,
180 IN UINT uDMAIdx, 180 UINT uDMAIdx,
181 IN PSTxDesc pHeadTD, 181 PSTxDesc pHeadTD,
182 IN PSEthernetHeader psEthHeader, 182 PSEthernetHeader psEthHeader,
183 IN PBYTE pPacket, 183 PBYTE pPacket,
184 IN BOOL bNeedEncrypt, 184 BOOL bNeedEncrypt,
185 IN PSKeyItem pTransmitKey, 185 PSKeyItem pTransmitKey,
186 IN UINT uNodeIndex, 186 UINT uNodeIndex,
187 OUT PUINT puMACfragNum 187 OUT PUINT puMACfragNum
188 ); 188 );
189 189
@@ -191,17 +191,17 @@ s_cbFillTxBufHead (
191static 191static
192UINT 192UINT
193s_uFillDataHead ( 193s_uFillDataHead (
194 IN PSDevice pDevice, 194 PSDevice pDevice,
195 IN BYTE byPktType, 195 BYTE byPktType,
196 IN void * pTxDataHead, 196 void * pTxDataHead,
197 IN UINT cbFrameLength, 197 UINT cbFrameLength,
198 IN UINT uDMAIdx, 198 UINT uDMAIdx,
199 IN BOOL bNeedAck, 199 BOOL bNeedAck,
200 IN UINT uFragIdx, 200 UINT uFragIdx,
201 IN UINT cbLastFragmentSize, 201 UINT cbLastFragmentSize,
202 IN UINT uMACfragNum, 202 UINT uMACfragNum,
203 IN BYTE byFBOption, 203 BYTE byFBOption,
204 IN WORD wCurrentRate 204 WORD wCurrentRate
205 ); 205 );
206 206
207 207
@@ -212,12 +212,12 @@ s_uFillDataHead (
212static 212static
213void 213void
214s_vFillTxKey ( 214s_vFillTxKey (
215 IN PSDevice pDevice, 215 PSDevice pDevice,
216 IN PBYTE pbyBuf, 216 PBYTE pbyBuf,
217 IN PBYTE pbyIVHead, 217 PBYTE pbyIVHead,
218 IN PSKeyItem pTransmitKey, 218 PSKeyItem pTransmitKey,
219 IN PBYTE pbyHdrBuf, 219 PBYTE pbyHdrBuf,
220 IN WORD wPayloadLen, 220 WORD wPayloadLen,
221 OUT PBYTE pMICHDR 221 OUT PBYTE pMICHDR
222 ) 222 )
223{ 223{
@@ -330,10 +330,10 @@ s_vFillTxKey (
330static 330static
331void 331void
332s_vSWencryption ( 332s_vSWencryption (
333 IN PSDevice pDevice, 333 PSDevice pDevice,
334 IN PSKeyItem pTransmitKey, 334 PSKeyItem pTransmitKey,
335 IN PBYTE pbyPayloadHead, 335 PBYTE pbyPayloadHead,
336 IN WORD wPayloadSize 336 WORD wPayloadSize
337 ) 337 )
338{ 338{
339 UINT cbICVlen = 4; 339 UINT cbICVlen = 4;
@@ -379,11 +379,11 @@ s_vSWencryption (
379static 379static
380UINT 380UINT
381s_uGetTxRsvTime ( 381s_uGetTxRsvTime (
382 IN PSDevice pDevice, 382 PSDevice pDevice,
383 IN BYTE byPktType, 383 BYTE byPktType,
384 IN UINT cbFrameLength, 384 UINT cbFrameLength,
385 IN WORD wRate, 385 WORD wRate,
386 IN BOOL bNeedAck 386 BOOL bNeedAck
387 ) 387 )
388{ 388{
389 UINT uDataTime, uAckTime; 389 UINT uDataTime, uAckTime;
@@ -410,11 +410,11 @@ s_uGetTxRsvTime (
410static 410static
411UINT 411UINT
412s_uGetRTSCTSRsvTime ( 412s_uGetRTSCTSRsvTime (
413 IN PSDevice pDevice, 413 PSDevice pDevice,
414 IN BYTE byRTSRsvType, 414 BYTE byRTSRsvType,
415 IN BYTE byPktType, 415 BYTE byPktType,
416 IN UINT cbFrameLength, 416 UINT cbFrameLength,
417 IN WORD wCurrentRate 417 WORD wCurrentRate
418 ) 418 )
419{ 419{
420 UINT uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime; 420 UINT uRrvTime , uRTSTime, uCTSTime, uAckTime, uDataTime;
@@ -452,16 +452,16 @@ s_uGetRTSCTSRsvTime (
452static 452static
453UINT 453UINT
454s_uGetDataDuration ( 454s_uGetDataDuration (
455 IN PSDevice pDevice, 455 PSDevice pDevice,
456 IN BYTE byDurType, 456 BYTE byDurType,
457 IN UINT cbFrameLength, 457 UINT cbFrameLength,
458 IN BYTE byPktType, 458 BYTE byPktType,
459 IN WORD wRate, 459 WORD wRate,
460 IN BOOL bNeedAck, 460 BOOL bNeedAck,
461 IN UINT uFragIdx, 461 UINT uFragIdx,
462 IN UINT cbLastFragmentSize, 462 UINT cbLastFragmentSize,
463 IN UINT uMACfragNum, 463 UINT uMACfragNum,
464 IN BYTE byFBOption 464 BYTE byFBOption
465 ) 465 )
466{ 466{
467 BOOL bLastFrag = 0; 467 BOOL bLastFrag = 0;
@@ -623,13 +623,13 @@ s_uGetDataDuration (
623static 623static
624UINT 624UINT
625s_uGetRTSCTSDuration ( 625s_uGetRTSCTSDuration (
626 IN PSDevice pDevice, 626 PSDevice pDevice,
627 IN BYTE byDurType, 627 BYTE byDurType,
628 IN UINT cbFrameLength, 628 UINT cbFrameLength,
629 IN BYTE byPktType, 629 BYTE byPktType,
630 IN WORD wRate, 630 WORD wRate,
631 IN BOOL bNeedAck, 631 BOOL bNeedAck,
632 IN BYTE byFBOption 632 BYTE byFBOption
633 ) 633 )
634{ 634{
635 UINT uCTSTime = 0, uDurTime = 0; 635 UINT uCTSTime = 0, uDurTime = 0;
@@ -721,17 +721,17 @@ s_uGetRTSCTSDuration (
721static 721static
722UINT 722UINT
723s_uFillDataHead ( 723s_uFillDataHead (
724 IN PSDevice pDevice, 724 PSDevice pDevice,
725 IN BYTE byPktType, 725 BYTE byPktType,
726 IN void * pTxDataHead, 726 void * pTxDataHead,
727 IN UINT cbFrameLength, 727 UINT cbFrameLength,
728 IN UINT uDMAIdx, 728 UINT uDMAIdx,
729 IN BOOL bNeedAck, 729 BOOL bNeedAck,
730 IN UINT uFragIdx, 730 UINT uFragIdx,
731 IN UINT cbLastFragmentSize, 731 UINT cbLastFragmentSize,
732 IN UINT uMACfragNum, 732 UINT uMACfragNum,
733 IN BYTE byFBOption, 733 BYTE byFBOption,
734 IN WORD wCurrentRate 734 WORD wCurrentRate
735 ) 735 )
736{ 736{
737 WORD wLen = 0x0000; 737 WORD wLen = 0x0000;
@@ -853,15 +853,15 @@ s_uFillDataHead (
853static 853static
854void 854void
855s_vFillRTSHead ( 855s_vFillRTSHead (
856 IN PSDevice pDevice, 856 PSDevice pDevice,
857 IN BYTE byPktType, 857 BYTE byPktType,
858 IN void * pvRTS, 858 void * pvRTS,
859 IN UINT cbFrameLength, 859 UINT cbFrameLength,
860 IN BOOL bNeedAck, 860 BOOL bNeedAck,
861 IN BOOL bDisCRC, 861 BOOL bDisCRC,
862 IN PSEthernetHeader psEthHeader, 862 PSEthernetHeader psEthHeader,
863 IN WORD wCurrentRate, 863 WORD wCurrentRate,
864 IN BYTE byFBOption 864 BYTE byFBOption
865 ) 865 )
866{ 866{
867 UINT uRTSFrameLen = 20; 867 UINT uRTSFrameLen = 20;
@@ -1047,15 +1047,15 @@ s_vFillRTSHead (
1047static 1047static
1048void 1048void
1049s_vFillCTSHead ( 1049s_vFillCTSHead (
1050 IN PSDevice pDevice, 1050 PSDevice pDevice,
1051 IN UINT uDMAIdx, 1051 UINT uDMAIdx,
1052 IN BYTE byPktType, 1052 BYTE byPktType,
1053 IN void * pvCTS, 1053 void * pvCTS,
1054 IN UINT cbFrameLength, 1054 UINT cbFrameLength,
1055 IN BOOL bNeedAck, 1055 BOOL bNeedAck,
1056 IN BOOL bDisCRC, 1056 BOOL bDisCRC,
1057 IN WORD wCurrentRate, 1057 WORD wCurrentRate,
1058 IN BYTE byFBOption 1058 BYTE byFBOption
1059 ) 1059 )
1060{ 1060{
1061 UINT uCTSFrameLen = 14; 1061 UINT uCTSFrameLen = 14;
@@ -1152,17 +1152,17 @@ s_vFillCTSHead (
1152static 1152static
1153void 1153void
1154s_vGenerateTxParameter ( 1154s_vGenerateTxParameter (
1155 IN PSDevice pDevice, 1155 PSDevice pDevice,
1156 IN BYTE byPktType, 1156 BYTE byPktType,
1157 IN void * pTxBufHead, 1157 void * pTxBufHead,
1158 IN void * pvRrvTime, 1158 void * pvRrvTime,
1159 IN void * pvRTS, 1159 void * pvRTS,
1160 IN void * pvCTS, 1160 void * pvCTS,
1161 IN UINT cbFrameSize, 1161 UINT cbFrameSize,
1162 IN BOOL bNeedACK, 1162 BOOL bNeedACK,
1163 IN UINT uDMAIdx, 1163 UINT uDMAIdx,
1164 IN PSEthernetHeader psEthHeader, 1164 PSEthernetHeader psEthHeader,
1165 IN WORD wCurrentRate 1165 WORD wCurrentRate
1166 ) 1166 )
1167{ 1167{
1168 UINT cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24 1168 UINT cbMACHdLen = WLAN_HDR_ADDR3_LEN; //24
@@ -1270,12 +1270,12 @@ s_vGenerateTxParameter (
1270static 1270static
1271void 1271void
1272s_vFillFragParameter( 1272s_vFillFragParameter(
1273 IN PSDevice pDevice, 1273 PSDevice pDevice,
1274 IN PBYTE pbyBuffer, 1274 PBYTE pbyBuffer,
1275 IN UINT uTxType, 1275 UINT uTxType,
1276 IN void * pvtdCurr, 1276 void * pvtdCurr,
1277 IN WORD wFragType, 1277 WORD wFragType,
1278 IN UINT cbReqCount 1278 UINT cbReqCount
1279 ) 1279 )
1280{ 1280{
1281 PSTxBufHead pTxBufHead = (PSTxBufHead) pbyBuffer; 1281 PSTxBufHead pTxBufHead = (PSTxBufHead) pbyBuffer;
@@ -1318,17 +1318,17 @@ s_vFillFragParameter(
1318static 1318static
1319UINT 1319UINT
1320s_cbFillTxBufHead ( 1320s_cbFillTxBufHead (
1321 IN PSDevice pDevice, 1321 PSDevice pDevice,
1322 IN BYTE byPktType, 1322 BYTE byPktType,
1323 IN PBYTE pbyTxBufferAddr, 1323 PBYTE pbyTxBufferAddr,
1324 IN UINT cbFrameBodySize, 1324 UINT cbFrameBodySize,
1325 IN UINT uDMAIdx, 1325 UINT uDMAIdx,
1326 IN PSTxDesc pHeadTD, 1326 PSTxDesc pHeadTD,
1327 IN PSEthernetHeader psEthHeader, 1327 PSEthernetHeader psEthHeader,
1328 IN PBYTE pPacket, 1328 PBYTE pPacket,
1329 IN BOOL bNeedEncrypt, 1329 BOOL bNeedEncrypt,
1330 IN PSKeyItem pTransmitKey, 1330 PSKeyItem pTransmitKey,
1331 IN UINT uNodeIndex, 1331 UINT uNodeIndex,
1332 OUT PUINT puMACfragNum 1332 OUT PUINT puMACfragNum
1333 ) 1333 )
1334{ 1334{
@@ -2095,17 +2095,17 @@ s_cbFillTxBufHead (
2095 2095
2096void 2096void
2097vGenerateFIFOHeader ( 2097vGenerateFIFOHeader (
2098 IN PSDevice pDevice, 2098 PSDevice pDevice,
2099 IN BYTE byPktType, 2099 BYTE byPktType,
2100 IN PBYTE pbyTxBufferAddr, 2100 PBYTE pbyTxBufferAddr,
2101 IN BOOL bNeedEncrypt, 2101 BOOL bNeedEncrypt,
2102 IN UINT cbPayloadSize, 2102 UINT cbPayloadSize,
2103 IN UINT uDMAIdx, 2103 UINT uDMAIdx,
2104 IN PSTxDesc pHeadTD, 2104 PSTxDesc pHeadTD,
2105 IN PSEthernetHeader psEthHeader, 2105 PSEthernetHeader psEthHeader,
2106 IN PBYTE pPacket, 2106 PBYTE pPacket,
2107 IN PSKeyItem pTransmitKey, 2107 PSKeyItem pTransmitKey,
2108 IN UINT uNodeIndex, 2108 UINT uNodeIndex,
2109 OUT PUINT puMACfragNum, 2109 OUT PUINT puMACfragNum,
2110 OUT PUINT pcbHeaderSize 2110 OUT PUINT pcbHeaderSize
2111 ) 2111 )
@@ -2266,14 +2266,14 @@ vGenerateFIFOHeader (
2266 2266
2267void 2267void
2268vGenerateMACHeader ( 2268vGenerateMACHeader (
2269 IN PSDevice pDevice, 2269 PSDevice pDevice,
2270 IN PBYTE pbyBufferAddr, 2270 PBYTE pbyBufferAddr,
2271 IN WORD wDuration, 2271 WORD wDuration,
2272 IN PSEthernetHeader psEthHeader, 2272 PSEthernetHeader psEthHeader,
2273 IN BOOL bNeedEncrypt, 2273 BOOL bNeedEncrypt,
2274 IN WORD wFragType, 2274 WORD wFragType,
2275 IN UINT uDMAIdx, 2275 UINT uDMAIdx,
2276 IN UINT uFragIdx 2276 UINT uFragIdx
2277 ) 2277 )
2278{ 2278{
2279 PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr; 2279 PS802_11Header pMACHeader = (PS802_11Header)pbyBufferAddr;
@@ -2738,10 +2738,10 @@ CMD_STATUS csBeacon_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) {
2738 2738
2739UINT 2739UINT
2740cbGetFragCount ( 2740cbGetFragCount (
2741 IN PSDevice pDevice, 2741 PSDevice pDevice,
2742 IN PSKeyItem pTransmitKey, 2742 PSKeyItem pTransmitKey,
2743 IN UINT cbFrameBodySize, 2743 UINT cbFrameBodySize,
2744 IN PSEthernetHeader psEthHeader 2744 PSEthernetHeader psEthHeader
2745 ) 2745 )
2746{ 2746{
2747 UINT cbMACHdLen; 2747 UINT cbMACHdLen;
diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h
index 4c2df48be37..75988c74a18 100644
--- a/drivers/staging/vt6655/rxtx.h
+++ b/drivers/staging/vt6655/rxtx.h
@@ -41,20 +41,20 @@
41 41
42/* 42/*
43void vGenerateMACHeader( 43void vGenerateMACHeader(
44 IN PSDevice pDevice, 44 PSDevice pDevice,
45 IN DWORD dwTxBufferAddr, 45 DWORD dwTxBufferAddr,
46 IN PBYTE pbySkbData, 46 PBYTE pbySkbData,
47 IN UINT cbPacketSize, 47 UINT cbPacketSize,
48 IN BOOL bDMA0Used, 48 BOOL bDMA0Used,
49 OUT PUINT pcbHeadSize, 49 OUT PUINT pcbHeadSize,
50 OUT PUINT pcbAppendPayload 50 OUT PUINT pcbAppendPayload
51 ); 51 );
52 52
53void vProcessRxMACHeader ( 53void vProcessRxMACHeader (
54 IN PSDevice pDevice, 54 PSDevice pDevice,
55 IN DWORD dwRxBufferAddr, 55 DWORD dwRxBufferAddr,
56 IN UINT cbPacketSize, 56 UINT cbPacketSize,
57 IN BOOL bIsWEP, 57 BOOL bIsWEP,
58 OUT PUINT pcbHeadSize 58 OUT PUINT pcbHeadSize
59 ); 59 );
60*/ 60*/
@@ -62,39 +62,39 @@ void vProcessRxMACHeader (
62 62
63void 63void
64vGenerateMACHeader ( 64vGenerateMACHeader (
65 IN PSDevice pDevice, 65 PSDevice pDevice,
66 IN PBYTE pbyBufferAddr, 66 PBYTE pbyBufferAddr,
67 IN WORD wDuration, 67 WORD wDuration,
68 IN PSEthernetHeader psEthHeader, 68 PSEthernetHeader psEthHeader,
69 IN BOOL bNeedEncrypt, 69 BOOL bNeedEncrypt,
70 IN WORD wFragType, 70 WORD wFragType,
71 IN UINT uDMAIdx, 71 UINT uDMAIdx,
72 IN UINT uFragIdx 72 UINT uFragIdx
73 ); 73 );
74 74
75 75
76UINT 76UINT
77cbGetFragCount( 77cbGetFragCount(
78 IN PSDevice pDevice, 78 PSDevice pDevice,
79 IN PSKeyItem pTransmitKey, 79 PSKeyItem pTransmitKey,
80 IN UINT cbFrameBodySize, 80 UINT cbFrameBodySize,
81 IN PSEthernetHeader psEthHeader 81 PSEthernetHeader psEthHeader
82 ); 82 );
83 83
84 84
85void 85void
86vGenerateFIFOHeader ( 86vGenerateFIFOHeader (
87 IN PSDevice pDevice, 87 PSDevice pDevice,
88 IN BYTE byPktTyp, 88 BYTE byPktTyp,
89 IN PBYTE pbyTxBufferAddr, 89 PBYTE pbyTxBufferAddr,
90 IN BOOL bNeedEncrypt, 90 BOOL bNeedEncrypt,
91 IN UINT cbPayloadSize, 91 UINT cbPayloadSize,
92 IN UINT uDMAIdx, 92 UINT uDMAIdx,
93 IN PSTxDesc pHeadTD, 93 PSTxDesc pHeadTD,
94 IN PSEthernetHeader psEthHeader, 94 PSEthernetHeader psEthHeader,
95 IN PBYTE pPacket, 95 PBYTE pPacket,
96 IN PSKeyItem pTransmitKey, 96 PSKeyItem pTransmitKey,
97 IN UINT uNodeIndex, 97 UINT uNodeIndex,
98 OUT PUINT puMACfragNum, 98 OUT PUINT puMACfragNum,
99 OUT PUINT pcbHeaderSize 99 OUT PUINT pcbHeaderSize
100 ); 100 );
diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h
index b2dff3a7b77..2921083a9f2 100644
--- a/drivers/staging/vt6655/ttype.h
+++ b/drivers/staging/vt6655/ttype.h
@@ -33,10 +33,6 @@
33 33
34/******* Common definitions and typedefs ***********************************/ 34/******* Common definitions and typedefs ***********************************/
35 35
36#ifndef IN
37#define IN
38#endif
39
40#ifndef OUT 36#ifndef OUT
41#define OUT 37#define OUT
42#endif 38#endif
diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c
index 03975dabb8d..bd3b2afe2cf 100644
--- a/drivers/staging/vt6655/vntwifi.c
+++ b/drivers/staging/vt6655/vntwifi.c
@@ -71,8 +71,8 @@
71-*/ 71-*/
72void 72void
73VNTWIFIvSetOPMode ( 73VNTWIFIvSetOPMode (
74 IN void *pMgmtHandle, 74 void *pMgmtHandle,
75 IN WMAC_CONFIG_MODE eOPMode 75 WMAC_CONFIG_MODE eOPMode
76 ) 76 )
77{ 77{
78 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 78 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -100,10 +100,10 @@ VNTWIFIvSetOPMode (
100-*/ 100-*/
101void 101void
102VNTWIFIvSetIBSSParameter ( 102VNTWIFIvSetIBSSParameter (
103 IN void *pMgmtHandle, 103 void *pMgmtHandle,
104 IN WORD wBeaconPeriod, 104 WORD wBeaconPeriod,
105 IN WORD wATIMWindow, 105 WORD wATIMWindow,
106 IN UINT uChannel 106 UINT uChannel
107 ) 107 )
108{ 108{
109 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 109 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -129,7 +129,7 @@ VNTWIFIvSetIBSSParameter (
129-*/ 129-*/
130PWLAN_IE_SSID 130PWLAN_IE_SSID
131VNTWIFIpGetCurrentSSID ( 131VNTWIFIpGetCurrentSSID (
132 IN void *pMgmtHandle 132 void *pMgmtHandle
133 ) 133 )
134{ 134{
135 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 135 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -152,7 +152,7 @@ VNTWIFIpGetCurrentSSID (
152-*/ 152-*/
153UINT 153UINT
154VNTWIFIpGetCurrentChannel ( 154VNTWIFIpGetCurrentChannel (
155 IN void *pMgmtHandle 155 void *pMgmtHandle
156 ) 156 )
157{ 157{
158 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 158 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -178,7 +178,7 @@ VNTWIFIpGetCurrentChannel (
178-*/ 178-*/
179WORD 179WORD
180VNTWIFIwGetAssocID ( 180VNTWIFIwGetAssocID (
181 IN void *pMgmtHandle 181 void *pMgmtHandle
182 ) 182 )
183{ 183{
184 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 184 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -204,8 +204,8 @@ VNTWIFIwGetAssocID (
204-*/ 204-*/
205BYTE 205BYTE
206VNTWIFIbyGetMaxSupportRate ( 206VNTWIFIbyGetMaxSupportRate (
207 IN PWLAN_IE_SUPP_RATES pSupportRateIEs, 207 PWLAN_IE_SUPP_RATES pSupportRateIEs,
208 IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs 208 PWLAN_IE_SUPP_RATES pExtSupportRateIEs
209 ) 209 )
210{ 210{
211 BYTE byMaxSupportRate = RATE_1M; 211 BYTE byMaxSupportRate = RATE_1M;
@@ -250,9 +250,9 @@ VNTWIFIbyGetMaxSupportRate (
250-*/ 250-*/
251BYTE 251BYTE
252VNTWIFIbyGetACKTxRate ( 252VNTWIFIbyGetACKTxRate (
253 IN BYTE byRxDataRate, 253 BYTE byRxDataRate,
254 IN PWLAN_IE_SUPP_RATES pSupportRateIEs, 254 PWLAN_IE_SUPP_RATES pSupportRateIEs,
255 IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs 255 PWLAN_IE_SUPP_RATES pExtSupportRateIEs
256 ) 256 )
257{ 257{
258 BYTE byMaxAckRate; 258 BYTE byMaxAckRate;
@@ -308,8 +308,8 @@ VNTWIFIbyGetACKTxRate (
308-*/ 308-*/
309void 309void
310VNTWIFIvSetAuthenticationMode ( 310VNTWIFIvSetAuthenticationMode (
311 IN void *pMgmtHandle, 311 void *pMgmtHandle,
312 IN WMAC_AUTHENTICATION_MODE eAuthMode 312 WMAC_AUTHENTICATION_MODE eAuthMode
313 ) 313 )
314{ 314{
315 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 315 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -340,8 +340,8 @@ VNTWIFIvSetAuthenticationMode (
340-*/ 340-*/
341void 341void
342VNTWIFIvSetEncryptionMode ( 342VNTWIFIvSetEncryptionMode (
343 IN void *pMgmtHandle, 343 void *pMgmtHandle,
344 IN WMAC_ENCRYPTION_MODE eEncryptionMode 344 WMAC_ENCRYPTION_MODE eEncryptionMode
345 ) 345 )
346{ 346{
347 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 347 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -360,8 +360,8 @@ VNTWIFIvSetEncryptionMode (
360 360
361BOOL 361BOOL
362VNTWIFIbConfigPhyMode ( 362VNTWIFIbConfigPhyMode (
363 IN void *pMgmtHandle, 363 void *pMgmtHandle,
364 IN CARD_PHY_TYPE ePhyType 364 CARD_PHY_TYPE ePhyType
365 ) 365 )
366{ 366{
367 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 367 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -381,7 +381,7 @@ VNTWIFIbConfigPhyMode (
381 381
382void 382void
383VNTWIFIbGetConfigPhyMode ( 383VNTWIFIbGetConfigPhyMode (
384 IN void *pMgmtHandle, 384 void *pMgmtHandle,
385 OUT void *pePhyType 385 OUT void *pePhyType
386 ) 386 )
387{ 387{
@@ -426,7 +426,7 @@ VNTWIFIbGetConfigPhyMode (
426 426
427void 427void
428VNTWIFIvQueryBSSList ( 428VNTWIFIvQueryBSSList (
429 IN void *pMgmtHandle, 429 void *pMgmtHandle,
430 OUT PUINT puBSSCount, 430 OUT PUINT puBSSCount,
431 OUT void **pvFirstBSS 431 OUT void **pvFirstBSS
432 ) 432 )
@@ -456,8 +456,8 @@ VNTWIFIvQueryBSSList (
456 456
457void 457void
458VNTWIFIvGetNextBSS ( 458VNTWIFIvGetNextBSS (
459 IN void *pMgmtHandle, 459 void *pMgmtHandle,
460 IN void *pvCurrentBSS, 460 void *pvCurrentBSS,
461 OUT void **pvNextBSS 461 OUT void **pvNextBSS
462 ) 462 )
463{ 463{
@@ -496,11 +496,11 @@ VNTWIFIvGetNextBSS (
496-*/ 496-*/
497void 497void
498VNTWIFIvUpdateNodeTxCounter( 498VNTWIFIvUpdateNodeTxCounter(
499 IN void *pMgmtHandle, 499 void *pMgmtHandle,
500 IN PBYTE pbyDestAddress, 500 PBYTE pbyDestAddress,
501 IN BOOL bTxOk, 501 BOOL bTxOk,
502 IN WORD wRate, 502 WORD wRate,
503 IN PBYTE pbyTxFailCount 503 PBYTE pbyTxFailCount
504 ) 504 )
505{ 505{
506 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 506 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -531,8 +531,8 @@ VNTWIFIvUpdateNodeTxCounter(
531 531
532void 532void
533VNTWIFIvGetTxRate( 533VNTWIFIvGetTxRate(
534 IN void *pMgmtHandle, 534 void *pMgmtHandle,
535 IN PBYTE pbyDestAddress, 535 PBYTE pbyDestAddress,
536 OUT PWORD pwTxDataRate, 536 OUT PWORD pwTxDataRate,
537 OUT PBYTE pbyACKRate, 537 OUT PBYTE pbyACKRate,
538 OUT PBYTE pbyCCKBasicRate, 538 OUT PBYTE pbyCCKBasicRate,
@@ -603,8 +603,8 @@ VNTWIFIvGetTxRate(
603 603
604BYTE 604BYTE
605VNTWIFIbyGetKeyCypher( 605VNTWIFIbyGetKeyCypher(
606 IN void *pMgmtHandle, 606 void *pMgmtHandle,
607 IN BOOL bGroupKey 607 BOOL bGroupKey
608 ) 608 )
609{ 609{
610 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; 610 PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle;
@@ -620,7 +620,7 @@ VNTWIFIbyGetKeyCypher(
620/* 620/*
621BOOL 621BOOL
622VNTWIFIbInit( 622VNTWIFIbInit(
623 IN void *pAdapterHandler, 623 void *pAdapterHandler,
624 OUT void **pMgmtHandler 624 OUT void **pMgmtHandler
625 ) 625 )
626{ 626{
@@ -664,9 +664,9 @@ VNTWIFIbInit(
664 664
665BOOL 665BOOL
666VNTWIFIbSetPMKIDCache ( 666VNTWIFIbSetPMKIDCache (
667 IN void *pMgmtObject, 667 void *pMgmtObject,
668 IN ULONG ulCount, 668 ULONG ulCount,
669 IN void *pPMKIDInfo 669 void *pPMKIDInfo
670 ) 670 )
671{ 671{
672 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; 672 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
@@ -683,7 +683,7 @@ VNTWIFIbSetPMKIDCache (
683 683
684WORD 684WORD
685VNTWIFIwGetMaxSupportRate( 685VNTWIFIwGetMaxSupportRate(
686 IN void *pMgmtObject 686 void *pMgmtObject
687 ) 687 )
688{ 688{
689 WORD wRate = RATE_54M; 689 WORD wRate = RATE_54M;
@@ -704,8 +704,8 @@ VNTWIFIwGetMaxSupportRate(
704 704
705void 705void
706VNTWIFIvSet11h ( 706VNTWIFIvSet11h (
707 IN void *pMgmtObject, 707 void *pMgmtObject,
708 IN BOOL b11hEnable 708 BOOL b11hEnable
709 ) 709 )
710{ 710{
711 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; 711 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
@@ -715,13 +715,13 @@ VNTWIFIvSet11h (
715 715
716BOOL 716BOOL
717VNTWIFIbMeasureReport( 717VNTWIFIbMeasureReport(
718 IN void *pMgmtObject, 718 void *pMgmtObject,
719 IN BOOL bEndOfReport, 719 BOOL bEndOfReport,
720 IN void *pvMeasureEID, 720 void *pvMeasureEID,
721 IN BYTE byReportMode, 721 BYTE byReportMode,
722 IN BYTE byBasicMap, 722 BYTE byBasicMap,
723 IN BYTE byCCAFraction, 723 BYTE byCCAFraction,
724 IN PBYTE pbyRPIs 724 PBYTE pbyRPIs
725 ) 725 )
726{ 726{
727 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; 727 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
@@ -775,8 +775,8 @@ VNTWIFIbMeasureReport(
775 775
776BOOL 776BOOL
777VNTWIFIbChannelSwitch( 777VNTWIFIbChannelSwitch(
778 IN void *pMgmtObject, 778 void *pMgmtObject,
779 IN BYTE byNewChannel 779 BYTE byNewChannel
780 ) 780 )
781{ 781{
782 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; 782 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
@@ -791,8 +791,8 @@ VNTWIFIbChannelSwitch(
791/* 791/*
792BOOL 792BOOL
793VNTWIFIbRadarPresent( 793VNTWIFIbRadarPresent(
794 IN void *pMgmtObject, 794 void *pMgmtObject,
795 IN BYTE byChannel 795 BYTE byChannel
796 ) 796 )
797{ 797{
798 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; 798 PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject;
diff --git a/drivers/staging/vt6655/vntwifi.h b/drivers/staging/vt6655/vntwifi.h
index 666684af5cd..ca1ee0e4446 100644
--- a/drivers/staging/vt6655/vntwifi.h
+++ b/drivers/staging/vt6655/vntwifi.h
@@ -142,74 +142,74 @@ typedef enum tagWMAC_POWER_MODE {
142 142
143void 143void
144VNTWIFIvSetIBSSParameter ( 144VNTWIFIvSetIBSSParameter (
145 IN void *pMgmtHandle, 145 void *pMgmtHandle,
146 IN WORD wBeaconPeriod, 146 WORD wBeaconPeriod,
147 IN WORD wATIMWindow, 147 WORD wATIMWindow,
148 IN UINT uChannel 148 UINT uChannel
149 ); 149 );
150 150
151void 151void
152VNTWIFIvSetOPMode ( 152VNTWIFIvSetOPMode (
153 IN void *pMgmtHandle, 153 void *pMgmtHandle,
154 IN WMAC_CONFIG_MODE eOPMode 154 WMAC_CONFIG_MODE eOPMode
155 ); 155 );
156 156
157PWLAN_IE_SSID 157PWLAN_IE_SSID
158VNTWIFIpGetCurrentSSID( 158VNTWIFIpGetCurrentSSID(
159 IN void *pMgmtHandle 159 void *pMgmtHandle
160 ); 160 );
161 161
162UINT 162UINT
163VNTWIFIpGetCurrentChannel( 163VNTWIFIpGetCurrentChannel(
164 IN void *pMgmtHandle 164 void *pMgmtHandle
165 ); 165 );
166 166
167WORD 167WORD
168VNTWIFIwGetAssocID ( 168VNTWIFIwGetAssocID (
169 IN void *pMgmtHandle 169 void *pMgmtHandle
170 ); 170 );
171 171
172BYTE 172BYTE
173VNTWIFIbyGetMaxSupportRate ( 173VNTWIFIbyGetMaxSupportRate (
174 IN PWLAN_IE_SUPP_RATES pSupportRateIEs, 174 PWLAN_IE_SUPP_RATES pSupportRateIEs,
175 IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs 175 PWLAN_IE_SUPP_RATES pExtSupportRateIEs
176 ); 176 );
177 177
178BYTE 178BYTE
179VNTWIFIbyGetACKTxRate ( 179VNTWIFIbyGetACKTxRate (
180 IN BYTE byRxDataRate, 180 BYTE byRxDataRate,
181 IN PWLAN_IE_SUPP_RATES pSupportRateIEs, 181 PWLAN_IE_SUPP_RATES pSupportRateIEs,
182 IN PWLAN_IE_SUPP_RATES pExtSupportRateIEs 182 PWLAN_IE_SUPP_RATES pExtSupportRateIEs
183 ); 183 );
184 184
185void 185void
186VNTWIFIvSetAuthenticationMode ( 186VNTWIFIvSetAuthenticationMode (
187 IN void *pMgmtHandle, 187 void *pMgmtHandle,
188 IN WMAC_AUTHENTICATION_MODE eAuthMode 188 WMAC_AUTHENTICATION_MODE eAuthMode
189 ); 189 );
190 190
191void 191void
192VNTWIFIvSetEncryptionMode ( 192VNTWIFIvSetEncryptionMode (
193 IN void *pMgmtHandle, 193 void *pMgmtHandle,
194 IN WMAC_ENCRYPTION_MODE eEncryptionMode 194 WMAC_ENCRYPTION_MODE eEncryptionMode
195 ); 195 );
196 196
197 197
198BOOL 198BOOL
199VNTWIFIbConfigPhyMode( 199VNTWIFIbConfigPhyMode(
200 IN void *pMgmtHandle, 200 void *pMgmtHandle,
201 IN CARD_PHY_TYPE ePhyType 201 CARD_PHY_TYPE ePhyType
202 ); 202 );
203 203
204void 204void
205VNTWIFIbGetConfigPhyMode( 205VNTWIFIbGetConfigPhyMode(
206 IN void *pMgmtHandle, 206 void *pMgmtHandle,
207 OUT void *pePhyType 207 OUT void *pePhyType
208 ); 208 );
209 209
210void 210void
211VNTWIFIvQueryBSSList( 211VNTWIFIvQueryBSSList(
212 IN void *pMgmtHandle, 212 void *pMgmtHandle,
213 OUT PUINT puBSSCount, 213 OUT PUINT puBSSCount,
214 OUT void **pvFirstBSS 214 OUT void **pvFirstBSS
215 ); 215 );
@@ -219,8 +219,8 @@ VNTWIFIvQueryBSSList(
219 219
220void 220void
221VNTWIFIvGetNextBSS ( 221VNTWIFIvGetNextBSS (
222 IN void *pMgmtHandle, 222 void *pMgmtHandle,
223 IN void *pvCurrentBSS, 223 void *pvCurrentBSS,
224 OUT void **pvNextBSS 224 OUT void **pvNextBSS
225 ); 225 );
226 226
@@ -228,18 +228,18 @@ VNTWIFIvGetNextBSS (
228 228
229void 229void
230VNTWIFIvUpdateNodeTxCounter( 230VNTWIFIvUpdateNodeTxCounter(
231 IN void *pMgmtHandle, 231 void *pMgmtHandle,
232 IN PBYTE pbyDestAddress, 232 PBYTE pbyDestAddress,
233 IN BOOL bTxOk, 233 BOOL bTxOk,
234 IN WORD wRate, 234 WORD wRate,
235 IN PBYTE pbyTxFailCount 235 PBYTE pbyTxFailCount
236 ); 236 );
237 237
238 238
239void 239void
240VNTWIFIvGetTxRate( 240VNTWIFIvGetTxRate(
241 IN void *pMgmtHandle, 241 void *pMgmtHandle,
242 IN PBYTE pbyDestAddress, 242 PBYTE pbyDestAddress,
243 OUT PWORD pwTxDataRate, 243 OUT PWORD pwTxDataRate,
244 OUT PBYTE pbyACKRate, 244 OUT PBYTE pbyACKRate,
245 OUT PBYTE pbyCCKBasicRate, 245 OUT PBYTE pbyCCKBasicRate,
@@ -248,15 +248,15 @@ VNTWIFIvGetTxRate(
248/* 248/*
249BOOL 249BOOL
250VNTWIFIbInit( 250VNTWIFIbInit(
251 IN void *pAdapterHandler, 251 void *pAdapterHandler,
252 OUT void **pMgmtHandler 252 OUT void **pMgmtHandler
253 ); 253 );
254*/ 254*/
255 255
256BYTE 256BYTE
257VNTWIFIbyGetKeyCypher( 257VNTWIFIbyGetKeyCypher(
258 IN void *pMgmtHandle, 258 void *pMgmtHandle,
259 IN BOOL bGroupKey 259 BOOL bGroupKey
260 ); 260 );
261 261
262 262
@@ -264,49 +264,49 @@ VNTWIFIbyGetKeyCypher(
264 264
265BOOL 265BOOL
266VNTWIFIbSetPMKIDCache ( 266VNTWIFIbSetPMKIDCache (
267 IN void *pMgmtObject, 267 void *pMgmtObject,
268 IN ULONG ulCount, 268 ULONG ulCount,
269 IN void *pPMKIDInfo 269 void *pPMKIDInfo
270 ); 270 );
271 271
272BOOL 272BOOL
273VNTWIFIbCommandRunning ( 273VNTWIFIbCommandRunning (
274 IN void *pMgmtObject 274 void *pMgmtObject
275 ); 275 );
276 276
277WORD 277WORD
278VNTWIFIwGetMaxSupportRate( 278VNTWIFIwGetMaxSupportRate(
279 IN void *pMgmtObject 279 void *pMgmtObject
280 ); 280 );
281 281
282// for 802.11h 282// for 802.11h
283void 283void
284VNTWIFIvSet11h ( 284VNTWIFIvSet11h (
285 IN void *pMgmtObject, 285 void *pMgmtObject,
286 IN BOOL b11hEnable 286 BOOL b11hEnable
287 ); 287 );
288 288
289BOOL 289BOOL
290VNTWIFIbMeasureReport( 290VNTWIFIbMeasureReport(
291 IN void *pMgmtObject, 291 void *pMgmtObject,
292 IN BOOL bEndOfReport, 292 BOOL bEndOfReport,
293 IN void *pvMeasureEID, 293 void *pvMeasureEID,
294 IN BYTE byReportMode, 294 BYTE byReportMode,
295 IN BYTE byBasicMap, 295 BYTE byBasicMap,
296 IN BYTE byCCAFraction, 296 BYTE byCCAFraction,
297 IN PBYTE pbyRPIs 297 PBYTE pbyRPIs
298 ); 298 );
299 299
300BOOL 300BOOL
301VNTWIFIbChannelSwitch( 301VNTWIFIbChannelSwitch(
302 IN void *pMgmtObject, 302 void *pMgmtObject,
303 IN BYTE byNewChannel 303 BYTE byNewChannel
304 ); 304 );
305/* 305/*
306BOOL 306BOOL
307VNTWIFIbRadarPresent( 307VNTWIFIbRadarPresent(
308 IN void *pMgmtObject, 308 void *pMgmtObject,
309 IN BYTE byChannel 309 BYTE byChannel
310 ); 310 );
311*/ 311*/
312 312
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index 6e460409f98..28665d870f5 100644
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -68,19 +68,19 @@ static int msglevel =MSG_LEVEL_INFO;
68static 68static
69void 69void
70s_vProbeChannel( 70s_vProbeChannel(
71 IN PSDevice pDevice 71 PSDevice pDevice
72 ); 72 );
73 73
74 74
75static 75static
76PSTxMgmtPacket 76PSTxMgmtPacket
77s_MgrMakeProbeRequest( 77s_MgrMakeProbeRequest(
78 IN PSDevice pDevice, 78 PSDevice pDevice,
79 IN PSMgmtObject pMgmt, 79 PSMgmtObject pMgmt,
80 IN PBYTE pScanBSSID, 80 PBYTE pScanBSSID,
81 IN PWLAN_IE_SSID pSSID, 81 PWLAN_IE_SSID pSSID,
82 IN PWLAN_IE_SUPP_RATES pCurrRates, 82 PWLAN_IE_SUPP_RATES pCurrRates,
83 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 83 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
84 ); 84 );
85 85
86 86
@@ -204,7 +204,7 @@ vAdHocBeaconRestart(PSDevice pDevice)
204static 204static
205void 205void
206s_vProbeChannel( 206s_vProbeChannel(
207 IN PSDevice pDevice 207 PSDevice pDevice
208 ) 208 )
209{ 209{
210 //1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M 210 //1M, 2M, 5M, 11M, 18M, 24M, 36M, 54M
@@ -267,12 +267,12 @@ s_vProbeChannel(
267 267
268PSTxMgmtPacket 268PSTxMgmtPacket
269s_MgrMakeProbeRequest( 269s_MgrMakeProbeRequest(
270 IN PSDevice pDevice, 270 PSDevice pDevice,
271 IN PSMgmtObject pMgmt, 271 PSMgmtObject pMgmt,
272 IN PBYTE pScanBSSID, 272 PBYTE pScanBSSID,
273 IN PWLAN_IE_SSID pSSID, 273 PWLAN_IE_SSID pSSID,
274 IN PWLAN_IE_SUPP_RATES pCurrRates, 274 PWLAN_IE_SUPP_RATES pCurrRates,
275 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 275 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
276 276
277 ) 277 )
278{ 278{
@@ -319,8 +319,8 @@ s_MgrMakeProbeRequest(
319 319
320void 320void
321vCommandTimerWait( 321vCommandTimerWait(
322 IN void *hDeviceContext, 322 void *hDeviceContext,
323 IN UINT MSecond 323 UINT MSecond
324 ) 324 )
325{ 325{
326 PSDevice pDevice = (PSDevice)hDeviceContext; 326 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -339,7 +339,7 @@ vCommandTimerWait(
339 339
340void 340void
341vCommandTimer ( 341vCommandTimer (
342 IN void *hDeviceContext 342 void *hDeviceContext
343 ) 343 )
344{ 344{
345 PSDevice pDevice = (PSDevice)hDeviceContext; 345 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -980,9 +980,9 @@ s_bCommandComplete (
980 980
981 981
982BOOL bScheduleCommand ( 982BOOL bScheduleCommand (
983 IN void *hDeviceContext, 983 void *hDeviceContext,
984 IN CMD_CODE eCommand, 984 CMD_CODE eCommand,
985 IN PBYTE pbyItem0 985 PBYTE pbyItem0
986 ) 986 )
987{ 987{
988 PSDevice pDevice = (PSDevice)hDeviceContext; 988 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1061,7 +1061,7 @@ BOOL bScheduleCommand (
1061 * 1061 *
1062 */ 1062 */
1063BOOL bClearBSSID_SCAN ( 1063BOOL bClearBSSID_SCAN (
1064 IN void *hDeviceContext 1064 void *hDeviceContext
1065 ) 1065 )
1066{ 1066{
1067 PSDevice pDevice = (PSDevice)hDeviceContext; 1067 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1083,7 +1083,7 @@ BOOL bClearBSSID_SCAN (
1083//mike add:reset command timer 1083//mike add:reset command timer
1084void 1084void
1085vResetCommandTimer( 1085vResetCommandTimer(
1086 IN void *hDeviceContext 1086 void *hDeviceContext
1087 ) 1087 )
1088{ 1088{
1089 PSDevice pDevice = (PSDevice)hDeviceContext; 1089 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1107,7 +1107,7 @@ vResetCommandTimer(
1107#ifdef TxInSleep 1107#ifdef TxInSleep
1108void 1108void
1109BSSvSecondTxData( 1109BSSvSecondTxData(
1110 IN void *hDeviceContext 1110 void *hDeviceContext
1111 ) 1111 )
1112{ 1112{
1113 PSDevice pDevice = (PSDevice)hDeviceContext; 1113 PSDevice pDevice = (PSDevice)hDeviceContext;
diff --git a/drivers/staging/vt6655/wcmd.h b/drivers/staging/vt6655/wcmd.h
index 67b08f61edc..c3c41808951 100644
--- a/drivers/staging/vt6655/wcmd.h
+++ b/drivers/staging/vt6655/wcmd.h
@@ -111,34 +111,34 @@ typedef enum tagCMD_STATE {
111/*--------------------- Export Functions --------------------------*/ 111/*--------------------- Export Functions --------------------------*/
112void 112void
113vResetCommandTimer( 113vResetCommandTimer(
114 IN void *hDeviceContext 114 void *hDeviceContext
115 ); 115 );
116 116
117void 117void
118vCommandTimer ( 118vCommandTimer (
119 IN void *hDeviceContext 119 void *hDeviceContext
120 ); 120 );
121 121
122BOOL bClearBSSID_SCAN( 122BOOL bClearBSSID_SCAN(
123 IN void *hDeviceContext 123 void *hDeviceContext
124 ); 124 );
125 125
126BOOL 126BOOL
127bScheduleCommand( 127bScheduleCommand(
128 IN void *hDeviceContext, 128 void *hDeviceContext,
129 IN CMD_CODE eCommand, 129 CMD_CODE eCommand,
130 IN PBYTE pbyItem0 130 PBYTE pbyItem0
131 ); 131 );
132 132
133void 133void
134vCommandTimerWait( 134vCommandTimerWait(
135 IN void *hDeviceContext, 135 void *hDeviceContext,
136 IN UINT MSecond 136 UINT MSecond
137 ); 137 );
138#ifdef TxInSleep 138#ifdef TxInSleep
139void 139void
140BSSvSecondTxData( 140BSSvSecondTxData(
141 IN void *hDeviceContext 141 void *hDeviceContext
142 ); 142 );
143#endif 143#endif
144 144
diff --git a/drivers/staging/vt6655/wmgr.c b/drivers/staging/vt6655/wmgr.c
index 614850a7b91..19a16cae175 100644
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@@ -94,110 +94,110 @@ static int msglevel =MSG_LEVEL_INFO;
94/*--------------------- Static Functions --------------------------*/ 94/*--------------------- Static Functions --------------------------*/
95//2008-8-4 <add> by chester 95//2008-8-4 <add> by chester
96static BOOL ChannelExceedZoneType( 96static BOOL ChannelExceedZoneType(
97 IN PSDevice pDevice, 97 PSDevice pDevice,
98 IN BYTE byCurrChannel 98 BYTE byCurrChannel
99 ); 99 );
100 100
101// Association/diassociation functions 101// Association/diassociation functions
102static 102static
103PSTxMgmtPacket 103PSTxMgmtPacket
104s_MgrMakeAssocRequest( 104s_MgrMakeAssocRequest(
105 IN PSDevice pDevice, 105 PSDevice pDevice,
106 IN PSMgmtObject pMgmt, 106 PSMgmtObject pMgmt,
107 IN PBYTE pDAddr, 107 PBYTE pDAddr,
108 IN WORD wCurrCapInfo, 108 WORD wCurrCapInfo,
109 IN WORD wListenInterval, 109 WORD wListenInterval,
110 IN PWLAN_IE_SSID pCurrSSID, 110 PWLAN_IE_SSID pCurrSSID,
111 IN PWLAN_IE_SUPP_RATES pCurrRates, 111 PWLAN_IE_SUPP_RATES pCurrRates,
112 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 112 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
113 ); 113 );
114 114
115static 115static
116void 116void
117s_vMgrRxAssocRequest( 117s_vMgrRxAssocRequest(
118 IN PSDevice pDevice, 118 PSDevice pDevice,
119 IN PSMgmtObject pMgmt, 119 PSMgmtObject pMgmt,
120 IN PSRxMgmtPacket pRxPacket, 120 PSRxMgmtPacket pRxPacket,
121 IN UINT uNodeIndex 121 UINT uNodeIndex
122 ); 122 );
123 123
124static 124static
125PSTxMgmtPacket 125PSTxMgmtPacket
126s_MgrMakeReAssocRequest( 126s_MgrMakeReAssocRequest(
127 IN PSDevice pDevice, 127 PSDevice pDevice,
128 IN PSMgmtObject pMgmt, 128 PSMgmtObject pMgmt,
129 IN PBYTE pDAddr, 129 PBYTE pDAddr,
130 IN WORD wCurrCapInfo, 130 WORD wCurrCapInfo,
131 IN WORD wListenInterval, 131 WORD wListenInterval,
132 IN PWLAN_IE_SSID pCurrSSID, 132 PWLAN_IE_SSID pCurrSSID,
133 IN PWLAN_IE_SUPP_RATES pCurrRates, 133 PWLAN_IE_SUPP_RATES pCurrRates,
134 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 134 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
135 ); 135 );
136 136
137static 137static
138void 138void
139s_vMgrRxAssocResponse( 139s_vMgrRxAssocResponse(
140 IN PSDevice pDevice, 140 PSDevice pDevice,
141 IN PSMgmtObject pMgmt, 141 PSMgmtObject pMgmt,
142 IN PSRxMgmtPacket pRxPacket, 142 PSRxMgmtPacket pRxPacket,
143 IN BOOL bReAssocType 143 BOOL bReAssocType
144 ); 144 );
145 145
146static 146static
147void 147void
148s_vMgrRxDisassociation( 148s_vMgrRxDisassociation(
149 IN PSDevice pDevice, 149 PSDevice pDevice,
150 IN PSMgmtObject pMgmt, 150 PSMgmtObject pMgmt,
151 IN PSRxMgmtPacket pRxPacket 151 PSRxMgmtPacket pRxPacket
152 ); 152 );
153 153
154// Authentication/deauthen functions 154// Authentication/deauthen functions
155static 155static
156void 156void
157s_vMgrRxAuthenSequence_1( 157s_vMgrRxAuthenSequence_1(
158 IN PSDevice pDevice, 158 PSDevice pDevice,
159 IN PSMgmtObject pMgmt, 159 PSMgmtObject pMgmt,
160 IN PWLAN_FR_AUTHEN pFrame 160 PWLAN_FR_AUTHEN pFrame
161 ); 161 );
162 162
163static 163static
164void 164void
165s_vMgrRxAuthenSequence_2( 165s_vMgrRxAuthenSequence_2(
166 IN PSDevice pDevice, 166 PSDevice pDevice,
167 IN PSMgmtObject pMgmt, 167 PSMgmtObject pMgmt,
168 IN PWLAN_FR_AUTHEN pFrame 168 PWLAN_FR_AUTHEN pFrame
169 ); 169 );
170 170
171static 171static
172void 172void
173s_vMgrRxAuthenSequence_3( 173s_vMgrRxAuthenSequence_3(
174 IN PSDevice pDevice, 174 PSDevice pDevice,
175 IN PSMgmtObject pMgmt, 175 PSMgmtObject pMgmt,
176 IN PWLAN_FR_AUTHEN pFrame 176 PWLAN_FR_AUTHEN pFrame
177 ); 177 );
178 178
179static 179static
180void 180void
181s_vMgrRxAuthenSequence_4( 181s_vMgrRxAuthenSequence_4(
182 IN PSDevice pDevice, 182 PSDevice pDevice,
183 IN PSMgmtObject pMgmt, 183 PSMgmtObject pMgmt,
184 IN PWLAN_FR_AUTHEN pFrame 184 PWLAN_FR_AUTHEN pFrame
185 ); 185 );
186 186
187static 187static
188void 188void
189s_vMgrRxAuthentication( 189s_vMgrRxAuthentication(
190 IN PSDevice pDevice, 190 PSDevice pDevice,
191 IN PSMgmtObject pMgmt, 191 PSMgmtObject pMgmt,
192 IN PSRxMgmtPacket pRxPacket 192 PSRxMgmtPacket pRxPacket
193 ); 193 );
194 194
195static 195static
196void 196void
197s_vMgrRxDeauthentication( 197s_vMgrRxDeauthentication(
198 IN PSDevice pDevice, 198 PSDevice pDevice,
199 IN PSMgmtObject pMgmt, 199 PSMgmtObject pMgmt,
200 IN PSRxMgmtPacket pRxPacket 200 PSRxMgmtPacket pRxPacket
201 ); 201 );
202 202
203// Scan functions 203// Scan functions
@@ -205,49 +205,49 @@ s_vMgrRxDeauthentication(
205static 205static
206void 206void
207s_vMgrRxProbeRequest( 207s_vMgrRxProbeRequest(
208 IN PSDevice pDevice, 208 PSDevice pDevice,
209 IN PSMgmtObject pMgmt, 209 PSMgmtObject pMgmt,
210 IN PSRxMgmtPacket pRxPacket 210 PSRxMgmtPacket pRxPacket
211 ); 211 );
212 212
213static 213static
214void 214void
215s_vMgrRxProbeResponse( 215s_vMgrRxProbeResponse(
216 IN PSDevice pDevice, 216 PSDevice pDevice,
217 IN PSMgmtObject pMgmt, 217 PSMgmtObject pMgmt,
218 IN PSRxMgmtPacket pRxPacket 218 PSRxMgmtPacket pRxPacket
219 ); 219 );
220 220
221// beacon functions 221// beacon functions
222static 222static
223void 223void
224s_vMgrRxBeacon( 224s_vMgrRxBeacon(
225 IN PSDevice pDevice, 225 PSDevice pDevice,
226 IN PSMgmtObject pMgmt, 226 PSMgmtObject pMgmt,
227 IN PSRxMgmtPacket pRxPacket, 227 PSRxMgmtPacket pRxPacket,
228 IN BOOL bInScan 228 BOOL bInScan
229 ); 229 );
230 230
231static 231static
232void 232void
233s_vMgrFormatTIM( 233s_vMgrFormatTIM(
234 IN PSMgmtObject pMgmt, 234 PSMgmtObject pMgmt,
235 IN PWLAN_IE_TIM pTIM 235 PWLAN_IE_TIM pTIM
236 ); 236 );
237 237
238static 238static
239PSTxMgmtPacket 239PSTxMgmtPacket
240s_MgrMakeBeacon( 240s_MgrMakeBeacon(
241 IN PSDevice pDevice, 241 PSDevice pDevice,
242 IN PSMgmtObject pMgmt, 242 PSMgmtObject pMgmt,
243 IN WORD wCurrCapInfo, 243 WORD wCurrCapInfo,
244 IN WORD wCurrBeaconPeriod, 244 WORD wCurrBeaconPeriod,
245 IN UINT uCurrChannel, 245 UINT uCurrChannel,
246 IN WORD wCurrATIMWinodw, 246 WORD wCurrATIMWinodw,
247 IN PWLAN_IE_SSID pCurrSSID, 247 PWLAN_IE_SSID pCurrSSID,
248 IN PBYTE pCurrBSSID, 248 PBYTE pCurrBSSID,
249 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 249 PWLAN_IE_SUPP_RATES pCurrSuppRates,
250 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 250 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
251 ); 251 );
252 252
253 253
@@ -255,78 +255,78 @@ s_MgrMakeBeacon(
255static 255static
256PSTxMgmtPacket 256PSTxMgmtPacket
257s_MgrMakeAssocResponse( 257s_MgrMakeAssocResponse(
258 IN PSDevice pDevice, 258 PSDevice pDevice,
259 IN PSMgmtObject pMgmt, 259 PSMgmtObject pMgmt,
260 IN WORD wCurrCapInfo, 260 WORD wCurrCapInfo,
261 IN WORD wAssocStatus, 261 WORD wAssocStatus,
262 IN WORD wAssocAID, 262 WORD wAssocAID,
263 IN PBYTE pDstAddr, 263 PBYTE pDstAddr,
264 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 264 PWLAN_IE_SUPP_RATES pCurrSuppRates,
265 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 265 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
266 ); 266 );
267 267
268// ReAssociation response 268// ReAssociation response
269static 269static
270PSTxMgmtPacket 270PSTxMgmtPacket
271s_MgrMakeReAssocResponse( 271s_MgrMakeReAssocResponse(
272 IN PSDevice pDevice, 272 PSDevice pDevice,
273 IN PSMgmtObject pMgmt, 273 PSMgmtObject pMgmt,
274 IN WORD wCurrCapInfo, 274 WORD wCurrCapInfo,
275 IN WORD wAssocStatus, 275 WORD wAssocStatus,
276 IN WORD wAssocAID, 276 WORD wAssocAID,
277 IN PBYTE pDstAddr, 277 PBYTE pDstAddr,
278 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 278 PWLAN_IE_SUPP_RATES pCurrSuppRates,
279 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 279 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
280 ); 280 );
281 281
282// Probe response 282// Probe response
283static 283static
284PSTxMgmtPacket 284PSTxMgmtPacket
285s_MgrMakeProbeResponse( 285s_MgrMakeProbeResponse(
286 IN PSDevice pDevice, 286 PSDevice pDevice,
287 IN PSMgmtObject pMgmt, 287 PSMgmtObject pMgmt,
288 IN WORD wCurrCapInfo, 288 WORD wCurrCapInfo,
289 IN WORD wCurrBeaconPeriod, 289 WORD wCurrBeaconPeriod,
290 IN UINT uCurrChannel, 290 UINT uCurrChannel,
291 IN WORD wCurrATIMWinodw, 291 WORD wCurrATIMWinodw,
292 IN PBYTE pDstAddr, 292 PBYTE pDstAddr,
293 IN PWLAN_IE_SSID pCurrSSID, 293 PWLAN_IE_SSID pCurrSSID,
294 IN PBYTE pCurrBSSID, 294 PBYTE pCurrBSSID,
295 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 295 PWLAN_IE_SUPP_RATES pCurrSuppRates,
296 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates, 296 PWLAN_IE_SUPP_RATES pCurrExtSuppRates,
297 IN BYTE byPHYType 297 BYTE byPHYType
298 ); 298 );
299 299
300// received status 300// received status
301static 301static
302void 302void
303s_vMgrLogStatus( 303s_vMgrLogStatus(
304 IN PSMgmtObject pMgmt, 304 PSMgmtObject pMgmt,
305 IN WORD wStatus 305 WORD wStatus
306 ); 306 );
307 307
308 308
309static 309static
310void 310void
311s_vMgrSynchBSS ( 311s_vMgrSynchBSS (
312 IN PSDevice pDevice, 312 PSDevice pDevice,
313 IN UINT uBSSMode, 313 UINT uBSSMode,
314 IN PKnownBSS pCurr, 314 PKnownBSS pCurr,
315 OUT PCMD_STATUS pStatus 315 OUT PCMD_STATUS pStatus
316 ); 316 );
317 317
318 318
319static BOOL 319static BOOL
320s_bCipherMatch ( 320s_bCipherMatch (
321 IN PKnownBSS pBSSNode, 321 PKnownBSS pBSSNode,
322 IN NDIS_802_11_ENCRYPTION_STATUS EncStatus, 322 NDIS_802_11_ENCRYPTION_STATUS EncStatus,
323 OUT PBYTE pbyCCSPK, 323 OUT PBYTE pbyCCSPK,
324 OUT PBYTE pbyCCSGK 324 OUT PBYTE pbyCCSGK
325 ); 325 );
326 326
327 static void Encyption_Rebuild( 327 static void Encyption_Rebuild(
328 IN PSDevice pDevice, 328 PSDevice pDevice,
329 IN PKnownBSS pCurr 329 PKnownBSS pCurr
330 ); 330 );
331 331
332 332
@@ -349,7 +349,7 @@ s_bCipherMatch (
349 349
350void 350void
351vMgrObjectInit( 351vMgrObjectInit(
352 IN void *hDeviceContext 352 void *hDeviceContext
353 ) 353 )
354{ 354{
355 PSDevice pDevice = (PSDevice)hDeviceContext; 355 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -385,7 +385,7 @@ vMgrObjectInit(
385 385
386void 386void
387vMgrTimerInit( 387vMgrTimerInit(
388 IN void *hDeviceContext 388 void *hDeviceContext
389 ) 389 )
390{ 390{
391 PSDevice pDevice = (PSDevice)hDeviceContext; 391 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -433,7 +433,7 @@ vMgrTimerInit(
433 433
434void 434void
435vMgrObjectReset( 435vMgrObjectReset(
436 IN void *hDeviceContext 436 void *hDeviceContext
437 ) 437 )
438{ 438{
439 PSDevice pDevice = (PSDevice)hDeviceContext; 439 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -462,8 +462,8 @@ vMgrObjectReset(
462 462
463void 463void
464vMgrAssocBeginSta( 464vMgrAssocBeginSta(
465 IN void *hDeviceContext, 465 void *hDeviceContext,
466 IN PSMgmtObject pMgmt, 466 PSMgmtObject pMgmt,
467 OUT PCMD_STATUS pStatus 467 OUT PCMD_STATUS pStatus
468 ) 468 )
469{ 469{
@@ -538,8 +538,8 @@ vMgrAssocBeginSta(
538 538
539void 539void
540vMgrReAssocBeginSta( 540vMgrReAssocBeginSta(
541 IN void *hDeviceContext, 541 void *hDeviceContext,
542 IN PSMgmtObject pMgmt, 542 PSMgmtObject pMgmt,
543 OUT PCMD_STATUS pStatus 543 OUT PCMD_STATUS pStatus
544 ) 544 )
545{ 545{
@@ -617,10 +617,10 @@ vMgrReAssocBeginSta(
617 617
618void 618void
619vMgrDisassocBeginSta( 619vMgrDisassocBeginSta(
620 IN void *hDeviceContext, 620 void *hDeviceContext,
621 IN PSMgmtObject pMgmt, 621 PSMgmtObject pMgmt,
622 IN PBYTE abyDestAddress, 622 PBYTE abyDestAddress,
623 IN WORD wReason, 623 WORD wReason,
624 OUT PCMD_STATUS pStatus 624 OUT PCMD_STATUS pStatus
625 ) 625 )
626{ 626{
@@ -680,10 +680,10 @@ vMgrDisassocBeginSta(
680static 680static
681void 681void
682s_vMgrRxAssocRequest( 682s_vMgrRxAssocRequest(
683 IN PSDevice pDevice, 683 PSDevice pDevice,
684 IN PSMgmtObject pMgmt, 684 PSMgmtObject pMgmt,
685 IN PSRxMgmtPacket pRxPacket, 685 PSRxMgmtPacket pRxPacket,
686 IN UINT uNodeIndex 686 UINT uNodeIndex
687 ) 687 )
688{ 688{
689 WLAN_FR_ASSOCREQ sFrame; 689 WLAN_FR_ASSOCREQ sFrame;
@@ -842,10 +842,10 @@ s_vMgrRxAssocRequest(
842static 842static
843void 843void
844s_vMgrRxReAssocRequest( 844s_vMgrRxReAssocRequest(
845 IN PSDevice pDevice, 845 PSDevice pDevice,
846 IN PSMgmtObject pMgmt, 846 PSMgmtObject pMgmt,
847 IN PSRxMgmtPacket pRxPacket, 847 PSRxMgmtPacket pRxPacket,
848 IN UINT uNodeIndex 848 UINT uNodeIndex
849 ) 849 )
850{ 850{
851 WLAN_FR_REASSOCREQ sFrame; 851 WLAN_FR_REASSOCREQ sFrame;
@@ -992,10 +992,10 @@ s_vMgrRxReAssocRequest(
992static 992static
993void 993void
994s_vMgrRxAssocResponse( 994s_vMgrRxAssocResponse(
995 IN PSDevice pDevice, 995 PSDevice pDevice,
996 IN PSMgmtObject pMgmt, 996 PSMgmtObject pMgmt,
997 IN PSRxMgmtPacket pRxPacket, 997 PSRxMgmtPacket pRxPacket,
998 IN BOOL bReAssocType 998 BOOL bReAssocType
999 ) 999 )
1000{ 1000{
1001 WLAN_FR_ASSOCRESP sFrame; 1001 WLAN_FR_ASSOCRESP sFrame;
@@ -1152,8 +1152,8 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
1152 1152
1153void 1153void
1154vMgrAuthenBeginSta( 1154vMgrAuthenBeginSta(
1155 IN void *hDeviceContext, 1155 void *hDeviceContext,
1156 IN PSMgmtObject pMgmt, 1156 PSMgmtObject pMgmt,
1157 OUT PCMD_STATUS pStatus 1157 OUT PCMD_STATUS pStatus
1158 ) 1158 )
1159{ 1159{
@@ -1210,10 +1210,10 @@ vMgrAuthenBeginSta(
1210 1210
1211void 1211void
1212vMgrDeAuthenBeginSta( 1212vMgrDeAuthenBeginSta(
1213 IN void *hDeviceContext, 1213 void *hDeviceContext,
1214 IN PSMgmtObject pMgmt, 1214 PSMgmtObject pMgmt,
1215 IN PBYTE abyDestAddress, 1215 PBYTE abyDestAddress,
1216 IN WORD wReason, 1216 WORD wReason,
1217 OUT PCMD_STATUS pStatus 1217 OUT PCMD_STATUS pStatus
1218 ) 1218 )
1219{ 1219{
@@ -1267,9 +1267,9 @@ vMgrDeAuthenBeginSta(
1267static 1267static
1268void 1268void
1269s_vMgrRxAuthentication( 1269s_vMgrRxAuthentication(
1270 IN PSDevice pDevice, 1270 PSDevice pDevice,
1271 IN PSMgmtObject pMgmt, 1271 PSMgmtObject pMgmt,
1272 IN PSRxMgmtPacket pRxPacket 1272 PSRxMgmtPacket pRxPacket
1273 ) 1273 )
1274{ 1274{
1275 WLAN_FR_AUTHEN sFrame; 1275 WLAN_FR_AUTHEN sFrame;
@@ -1325,9 +1325,9 @@ s_vMgrRxAuthentication(
1325static 1325static
1326void 1326void
1327s_vMgrRxAuthenSequence_1( 1327s_vMgrRxAuthenSequence_1(
1328 IN PSDevice pDevice, 1328 PSDevice pDevice,
1329 IN PSMgmtObject pMgmt, 1329 PSMgmtObject pMgmt,
1330 IN PWLAN_FR_AUTHEN pFrame 1330 PWLAN_FR_AUTHEN pFrame
1331 ) 1331 )
1332{ 1332{
1333 PSTxMgmtPacket pTxPacket = NULL; 1333 PSTxMgmtPacket pTxPacket = NULL;
@@ -1431,9 +1431,9 @@ s_vMgrRxAuthenSequence_1(
1431static 1431static
1432void 1432void
1433s_vMgrRxAuthenSequence_2( 1433s_vMgrRxAuthenSequence_2(
1434 IN PSDevice pDevice, 1434 PSDevice pDevice,
1435 IN PSMgmtObject pMgmt, 1435 PSMgmtObject pMgmt,
1436 IN PWLAN_FR_AUTHEN pFrame 1436 PWLAN_FR_AUTHEN pFrame
1437 ) 1437 )
1438{ 1438{
1439 WLAN_FR_AUTHEN sFrame; 1439 WLAN_FR_AUTHEN sFrame;
@@ -1533,9 +1533,9 @@ s_vMgrRxAuthenSequence_2(
1533static 1533static
1534void 1534void
1535s_vMgrRxAuthenSequence_3( 1535s_vMgrRxAuthenSequence_3(
1536 IN PSDevice pDevice, 1536 PSDevice pDevice,
1537 IN PSMgmtObject pMgmt, 1537 PSMgmtObject pMgmt,
1538 IN PWLAN_FR_AUTHEN pFrame 1538 PWLAN_FR_AUTHEN pFrame
1539 ) 1539 )
1540{ 1540{
1541 PSTxMgmtPacket pTxPacket = NULL; 1541 PSTxMgmtPacket pTxPacket = NULL;
@@ -1621,9 +1621,9 @@ reply:
1621static 1621static
1622void 1622void
1623s_vMgrRxAuthenSequence_4( 1623s_vMgrRxAuthenSequence_4(
1624 IN PSDevice pDevice, 1624 PSDevice pDevice,
1625 IN PSMgmtObject pMgmt, 1625 PSMgmtObject pMgmt,
1626 IN PWLAN_FR_AUTHEN pFrame 1626 PWLAN_FR_AUTHEN pFrame
1627 ) 1627 )
1628{ 1628{
1629 1629
@@ -1660,9 +1660,9 @@ s_vMgrRxAuthenSequence_4(
1660static 1660static
1661void 1661void
1662s_vMgrRxDisassociation( 1662s_vMgrRxDisassociation(
1663 IN PSDevice pDevice, 1663 PSDevice pDevice,
1664 IN PSMgmtObject pMgmt, 1664 PSMgmtObject pMgmt,
1665 IN PSRxMgmtPacket pRxPacket 1665 PSRxMgmtPacket pRxPacket
1666 ) 1666 )
1667{ 1667{
1668 WLAN_FR_DISASSOC sFrame; 1668 WLAN_FR_DISASSOC sFrame;
@@ -1739,9 +1739,9 @@ s_vMgrRxDisassociation(
1739static 1739static
1740void 1740void
1741s_vMgrRxDeauthentication( 1741s_vMgrRxDeauthentication(
1742 IN PSDevice pDevice, 1742 PSDevice pDevice,
1743 IN PSMgmtObject pMgmt, 1743 PSMgmtObject pMgmt,
1744 IN PSRxMgmtPacket pRxPacket 1744 PSRxMgmtPacket pRxPacket
1745 ) 1745 )
1746{ 1746{
1747 WLAN_FR_DEAUTHEN sFrame; 1747 WLAN_FR_DEAUTHEN sFrame;
@@ -1827,8 +1827,8 @@ s_vMgrRxDeauthentication(
1827-*/ 1827-*/
1828static BOOL 1828static BOOL
1829ChannelExceedZoneType( 1829ChannelExceedZoneType(
1830 IN PSDevice pDevice, 1830 PSDevice pDevice,
1831 IN BYTE byCurrChannel 1831 BYTE byCurrChannel
1832 ) 1832 )
1833{ 1833{
1834 BOOL exceed=FALSE; 1834 BOOL exceed=FALSE;
@@ -1865,10 +1865,10 @@ ChannelExceedZoneType(
1865static 1865static
1866void 1866void
1867s_vMgrRxBeacon( 1867s_vMgrRxBeacon(
1868 IN PSDevice pDevice, 1868 PSDevice pDevice,
1869 IN PSMgmtObject pMgmt, 1869 PSMgmtObject pMgmt,
1870 IN PSRxMgmtPacket pRxPacket, 1870 PSRxMgmtPacket pRxPacket,
1871 IN BOOL bInScan 1871 BOOL bInScan
1872 ) 1872 )
1873{ 1873{
1874 1874
@@ -2386,7 +2386,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2386-*/ 2386-*/
2387void 2387void
2388vMgrCreateOwnIBSS( 2388vMgrCreateOwnIBSS(
2389 IN void *hDeviceContext, 2389 void *hDeviceContext,
2390 OUT PCMD_STATUS pStatus 2390 OUT PCMD_STATUS pStatus
2391 ) 2391 )
2392{ 2392{
@@ -2653,7 +2653,7 @@ vMgrCreateOwnIBSS(
2653 2653
2654void 2654void
2655vMgrJoinBSSBegin( 2655vMgrJoinBSSBegin(
2656 IN void *hDeviceContext, 2656 void *hDeviceContext,
2657 OUT PCMD_STATUS pStatus 2657 OUT PCMD_STATUS pStatus
2658 ) 2658 )
2659{ 2659{
@@ -2922,9 +2922,9 @@ vMgrJoinBSSBegin(
2922static 2922static
2923void 2923void
2924s_vMgrSynchBSS ( 2924s_vMgrSynchBSS (
2925 IN PSDevice pDevice, 2925 PSDevice pDevice,
2926 IN UINT uBSSMode, 2926 UINT uBSSMode,
2927 IN PKnownBSS pCurr, 2927 PKnownBSS pCurr,
2928 OUT PCMD_STATUS pStatus 2928 OUT PCMD_STATUS pStatus
2929 ) 2929 )
2930{ 2930{
@@ -3089,8 +3089,8 @@ s_vMgrSynchBSS (
3089//mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption 3089//mike add: fix NetworkManager 0.7.0 hidden ssid mode in WPA encryption
3090// ,need reset eAuthenMode and eEncryptionStatus 3090// ,need reset eAuthenMode and eEncryptionStatus
3091 static void Encyption_Rebuild( 3091 static void Encyption_Rebuild(
3092 IN PSDevice pDevice, 3092 PSDevice pDevice,
3093 IN PKnownBSS pCurr 3093 PKnownBSS pCurr
3094 ) 3094 )
3095 { 3095 {
3096 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 3096 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
@@ -3147,8 +3147,8 @@ s_vMgrSynchBSS (
3147static 3147static
3148void 3148void
3149s_vMgrFormatTIM( 3149s_vMgrFormatTIM(
3150 IN PSMgmtObject pMgmt, 3150 PSMgmtObject pMgmt,
3151 IN PWLAN_IE_TIM pTIM 3151 PWLAN_IE_TIM pTIM
3152 ) 3152 )
3153{ 3153{
3154 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; 3154 BYTE byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80};
@@ -3222,16 +3222,16 @@ s_vMgrFormatTIM(
3222static 3222static
3223PSTxMgmtPacket 3223PSTxMgmtPacket
3224s_MgrMakeBeacon( 3224s_MgrMakeBeacon(
3225 IN PSDevice pDevice, 3225 PSDevice pDevice,
3226 IN PSMgmtObject pMgmt, 3226 PSMgmtObject pMgmt,
3227 IN WORD wCurrCapInfo, 3227 WORD wCurrCapInfo,
3228 IN WORD wCurrBeaconPeriod, 3228 WORD wCurrBeaconPeriod,
3229 IN UINT uCurrChannel, 3229 UINT uCurrChannel,
3230 IN WORD wCurrATIMWinodw, 3230 WORD wCurrATIMWinodw,
3231 IN PWLAN_IE_SSID pCurrSSID, 3231 PWLAN_IE_SSID pCurrSSID,
3232 IN PBYTE pCurrBSSID, 3232 PBYTE pCurrBSSID,
3233 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 3233 PWLAN_IE_SUPP_RATES pCurrSuppRates,
3234 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 3234 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
3235 ) 3235 )
3236{ 3236{
3237 PSTxMgmtPacket pTxPacket = NULL; 3237 PSTxMgmtPacket pTxPacket = NULL;
@@ -3451,18 +3451,18 @@ s_MgrMakeBeacon(
3451 3451
3452PSTxMgmtPacket 3452PSTxMgmtPacket
3453s_MgrMakeProbeResponse( 3453s_MgrMakeProbeResponse(
3454 IN PSDevice pDevice, 3454 PSDevice pDevice,
3455 IN PSMgmtObject pMgmt, 3455 PSMgmtObject pMgmt,
3456 IN WORD wCurrCapInfo, 3456 WORD wCurrCapInfo,
3457 IN WORD wCurrBeaconPeriod, 3457 WORD wCurrBeaconPeriod,
3458 IN UINT uCurrChannel, 3458 UINT uCurrChannel,
3459 IN WORD wCurrATIMWinodw, 3459 WORD wCurrATIMWinodw,
3460 IN PBYTE pDstAddr, 3460 PBYTE pDstAddr,
3461 IN PWLAN_IE_SSID pCurrSSID, 3461 PWLAN_IE_SSID pCurrSSID,
3462 IN PBYTE pCurrBSSID, 3462 PBYTE pCurrBSSID,
3463 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 3463 PWLAN_IE_SUPP_RATES pCurrSuppRates,
3464 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates, 3464 PWLAN_IE_SUPP_RATES pCurrExtSuppRates,
3465 IN BYTE byPHYType 3465 BYTE byPHYType
3466 ) 3466 )
3467{ 3467{
3468 PSTxMgmtPacket pTxPacket = NULL; 3468 PSTxMgmtPacket pTxPacket = NULL;
@@ -3640,14 +3640,14 @@ s_MgrMakeProbeResponse(
3640 3640
3641PSTxMgmtPacket 3641PSTxMgmtPacket
3642s_MgrMakeAssocRequest( 3642s_MgrMakeAssocRequest(
3643 IN PSDevice pDevice, 3643 PSDevice pDevice,
3644 IN PSMgmtObject pMgmt, 3644 PSMgmtObject pMgmt,
3645 IN PBYTE pDAddr, 3645 PBYTE pDAddr,
3646 IN WORD wCurrCapInfo, 3646 WORD wCurrCapInfo,
3647 IN WORD wListenInterval, 3647 WORD wListenInterval,
3648 IN PWLAN_IE_SSID pCurrSSID, 3648 PWLAN_IE_SSID pCurrSSID,
3649 IN PWLAN_IE_SUPP_RATES pCurrRates, 3649 PWLAN_IE_SUPP_RATES pCurrRates,
3650 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 3650 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
3651 ) 3651 )
3652{ 3652{
3653 PSTxMgmtPacket pTxPacket = NULL; 3653 PSTxMgmtPacket pTxPacket = NULL;
@@ -3915,14 +3915,14 @@ s_MgrMakeAssocRequest(
3915 3915
3916PSTxMgmtPacket 3916PSTxMgmtPacket
3917s_MgrMakeReAssocRequest( 3917s_MgrMakeReAssocRequest(
3918 IN PSDevice pDevice, 3918 PSDevice pDevice,
3919 IN PSMgmtObject pMgmt, 3919 PSMgmtObject pMgmt,
3920 IN PBYTE pDAddr, 3920 PBYTE pDAddr,
3921 IN WORD wCurrCapInfo, 3921 WORD wCurrCapInfo,
3922 IN WORD wListenInterval, 3922 WORD wListenInterval,
3923 IN PWLAN_IE_SSID pCurrSSID, 3923 PWLAN_IE_SSID pCurrSSID,
3924 IN PWLAN_IE_SUPP_RATES pCurrRates, 3924 PWLAN_IE_SUPP_RATES pCurrRates,
3925 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 3925 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
3926 ) 3926 )
3927{ 3927{
3928 PSTxMgmtPacket pTxPacket = NULL; 3928 PSTxMgmtPacket pTxPacket = NULL;
@@ -4167,14 +4167,14 @@ s_MgrMakeReAssocRequest(
4167 4167
4168PSTxMgmtPacket 4168PSTxMgmtPacket
4169s_MgrMakeAssocResponse( 4169s_MgrMakeAssocResponse(
4170 IN PSDevice pDevice, 4170 PSDevice pDevice,
4171 IN PSMgmtObject pMgmt, 4171 PSMgmtObject pMgmt,
4172 IN WORD wCurrCapInfo, 4172 WORD wCurrCapInfo,
4173 IN WORD wAssocStatus, 4173 WORD wAssocStatus,
4174 IN WORD wAssocAID, 4174 WORD wAssocAID,
4175 IN PBYTE pDstAddr, 4175 PBYTE pDstAddr,
4176 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 4176 PWLAN_IE_SUPP_RATES pCurrSuppRates,
4177 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 4177 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
4178 ) 4178 )
4179{ 4179{
4180 PSTxMgmtPacket pTxPacket = NULL; 4180 PSTxMgmtPacket pTxPacket = NULL;
@@ -4241,14 +4241,14 @@ s_MgrMakeAssocResponse(
4241 4241
4242PSTxMgmtPacket 4242PSTxMgmtPacket
4243s_MgrMakeReAssocResponse( 4243s_MgrMakeReAssocResponse(
4244 IN PSDevice pDevice, 4244 PSDevice pDevice,
4245 IN PSMgmtObject pMgmt, 4245 PSMgmtObject pMgmt,
4246 IN WORD wCurrCapInfo, 4246 WORD wCurrCapInfo,
4247 IN WORD wAssocStatus, 4247 WORD wAssocStatus,
4248 IN WORD wAssocAID, 4248 WORD wAssocAID,
4249 IN PBYTE pDstAddr, 4249 PBYTE pDstAddr,
4250 IN PWLAN_IE_SUPP_RATES pCurrSuppRates, 4250 PWLAN_IE_SUPP_RATES pCurrSuppRates,
4251 IN PWLAN_IE_SUPP_RATES pCurrExtSuppRates 4251 PWLAN_IE_SUPP_RATES pCurrExtSuppRates
4252 ) 4252 )
4253{ 4253{
4254 PSTxMgmtPacket pTxPacket = NULL; 4254 PSTxMgmtPacket pTxPacket = NULL;
@@ -4315,9 +4315,9 @@ s_MgrMakeReAssocResponse(
4315static 4315static
4316void 4316void
4317s_vMgrRxProbeResponse( 4317s_vMgrRxProbeResponse(
4318 IN PSDevice pDevice, 4318 PSDevice pDevice,
4319 IN PSMgmtObject pMgmt, 4319 PSMgmtObject pMgmt,
4320 IN PSRxMgmtPacket pRxPacket 4320 PSRxMgmtPacket pRxPacket
4321 ) 4321 )
4322{ 4322{
4323 PKnownBSS pBSSList = NULL; 4323 PKnownBSS pBSSList = NULL;
@@ -4440,9 +4440,9 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
4440static 4440static
4441void 4441void
4442s_vMgrRxProbeRequest( 4442s_vMgrRxProbeRequest(
4443 IN PSDevice pDevice, 4443 PSDevice pDevice,
4444 IN PSMgmtObject pMgmt, 4444 PSMgmtObject pMgmt,
4445 IN PSRxMgmtPacket pRxPacket 4445 PSRxMgmtPacket pRxPacket
4446 ) 4446 )
4447{ 4447{
4448 WLAN_FR_PROBEREQ sFrame; 4448 WLAN_FR_PROBEREQ sFrame;
@@ -4536,9 +4536,9 @@ s_vMgrRxProbeRequest(
4536 4536
4537void 4537void
4538vMgrRxManagePacket( 4538vMgrRxManagePacket(
4539 IN void *hDeviceContext, 4539 void *hDeviceContext,
4540 IN PSMgmtObject pMgmt, 4540 PSMgmtObject pMgmt,
4541 IN PSRxMgmtPacket pRxPacket 4541 PSRxMgmtPacket pRxPacket
4542 ) 4542 )
4543{ 4543{
4544 PSDevice pDevice = (PSDevice)hDeviceContext; 4544 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -4685,8 +4685,8 @@ vMgrRxManagePacket(
4685-*/ 4685-*/
4686BOOL 4686BOOL
4687bMgrPrepareBeaconToSend( 4687bMgrPrepareBeaconToSend(
4688 IN void *hDeviceContext, 4688 void *hDeviceContext,
4689 IN PSMgmtObject pMgmt 4689 PSMgmtObject pMgmt
4690 ) 4690 )
4691{ 4691{
4692 PSDevice pDevice = (PSDevice)hDeviceContext; 4692 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -4740,8 +4740,8 @@ bMgrPrepareBeaconToSend(
4740static 4740static
4741void 4741void
4742s_vMgrLogStatus( 4742s_vMgrLogStatus(
4743 IN PSMgmtObject pMgmt, 4743 PSMgmtObject pMgmt,
4744 IN WORD wStatus 4744 WORD wStatus
4745 ) 4745 )
4746{ 4746{
4747 switch( wStatus ){ 4747 switch( wStatus ){
@@ -4809,9 +4809,9 @@ s_vMgrLogStatus(
4809-*/ 4809-*/
4810BOOL 4810BOOL
4811bAdd_PMKID_Candidate ( 4811bAdd_PMKID_Candidate (
4812 IN void *hDeviceContext, 4812 void *hDeviceContext,
4813 IN PBYTE pbyBSSID, 4813 PBYTE pbyBSSID,
4814 IN PSRSNCapObject psRSNCapObj 4814 PSRSNCapObject psRSNCapObj
4815 ) 4815 )
4816{ 4816{
4817 PSDevice pDevice = (PSDevice)hDeviceContext; 4817 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -4870,7 +4870,7 @@ bAdd_PMKID_Candidate (
4870-*/ 4870-*/
4871void 4871void
4872vFlush_PMKID_Candidate ( 4872vFlush_PMKID_Candidate (
4873 IN void *hDeviceContext 4873 void *hDeviceContext
4874 ) 4874 )
4875{ 4875{
4876 PSDevice pDevice = (PSDevice)hDeviceContext; 4876 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -4883,8 +4883,8 @@ vFlush_PMKID_Candidate (
4883 4883
4884static BOOL 4884static BOOL
4885s_bCipherMatch ( 4885s_bCipherMatch (
4886 IN PKnownBSS pBSSNode, 4886 PKnownBSS pBSSNode,
4887 IN NDIS_802_11_ENCRYPTION_STATUS EncStatus, 4887 NDIS_802_11_ENCRYPTION_STATUS EncStatus,
4888 OUT PBYTE pbyCCSPK, 4888 OUT PBYTE pbyCCSPK,
4889 OUT PBYTE pbyCCSGK 4889 OUT PBYTE pbyCCSGK
4890 ) 4890 )
diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h
index cee86028181..a86406e63bc 100644
--- a/drivers/staging/vt6655/wmgr.h
+++ b/drivers/staging/vt6655/wmgr.h
@@ -401,102 +401,102 @@ typedef struct tagSMgmtObject
401 401
402void 402void
403vMgrObjectInit( 403vMgrObjectInit(
404 IN void *hDeviceContext 404 void *hDeviceContext
405 ); 405 );
406 406
407void 407void
408vMgrTimerInit( 408vMgrTimerInit(
409 IN void *hDeviceContext 409 void *hDeviceContext
410 ); 410 );
411 411
412void 412void
413vMgrObjectReset( 413vMgrObjectReset(
414 IN void *hDeviceContext 414 void *hDeviceContext
415 ); 415 );
416 416
417void 417void
418vMgrAssocBeginSta( 418vMgrAssocBeginSta(
419 IN void *hDeviceContext, 419 void *hDeviceContext,
420 IN PSMgmtObject pMgmt, 420 PSMgmtObject pMgmt,
421 OUT PCMD_STATUS pStatus 421 OUT PCMD_STATUS pStatus
422 ); 422 );
423 423
424void 424void
425vMgrReAssocBeginSta( 425vMgrReAssocBeginSta(
426 IN void *hDeviceContext, 426 void *hDeviceContext,
427 IN PSMgmtObject pMgmt, 427 PSMgmtObject pMgmt,
428 OUT PCMD_STATUS pStatus 428 OUT PCMD_STATUS pStatus
429 ); 429 );
430 430
431void 431void
432vMgrDisassocBeginSta( 432vMgrDisassocBeginSta(
433 IN void *hDeviceContext, 433 void *hDeviceContext,
434 IN PSMgmtObject pMgmt, 434 PSMgmtObject pMgmt,
435 IN PBYTE abyDestAddress, 435 PBYTE abyDestAddress,
436 IN WORD wReason, 436 WORD wReason,
437 OUT PCMD_STATUS pStatus 437 OUT PCMD_STATUS pStatus
438 ); 438 );
439 439
440void 440void
441vMgrAuthenBeginSta( 441vMgrAuthenBeginSta(
442 IN void *hDeviceContext, 442 void *hDeviceContext,
443 IN PSMgmtObject pMgmt, 443 PSMgmtObject pMgmt,
444 OUT PCMD_STATUS pStatus 444 OUT PCMD_STATUS pStatus
445 ); 445 );
446 446
447void 447void
448vMgrCreateOwnIBSS( 448vMgrCreateOwnIBSS(
449 IN void *hDeviceContext, 449 void *hDeviceContext,
450 OUT PCMD_STATUS pStatus 450 OUT PCMD_STATUS pStatus
451 ); 451 );
452 452
453void 453void
454vMgrJoinBSSBegin( 454vMgrJoinBSSBegin(
455 IN void *hDeviceContext, 455 void *hDeviceContext,
456 OUT PCMD_STATUS pStatus 456 OUT PCMD_STATUS pStatus
457 ); 457 );
458 458
459void 459void
460vMgrRxManagePacket( 460vMgrRxManagePacket(
461 IN void *hDeviceContext, 461 void *hDeviceContext,
462 IN PSMgmtObject pMgmt, 462 PSMgmtObject pMgmt,
463 IN PSRxMgmtPacket pRxPacket 463 PSRxMgmtPacket pRxPacket
464 ); 464 );
465 465
466/* 466/*
467void 467void
468vMgrScanBegin( 468vMgrScanBegin(
469 IN void *hDeviceContext, 469 void *hDeviceContext,
470 OUT PCMD_STATUS pStatus 470 OUT PCMD_STATUS pStatus
471 ); 471 );
472*/ 472*/
473 473
474void 474void
475vMgrDeAuthenBeginSta( 475vMgrDeAuthenBeginSta(
476 IN void *hDeviceContext, 476 void *hDeviceContext,
477 IN PSMgmtObject pMgmt, 477 PSMgmtObject pMgmt,
478 IN PBYTE abyDestAddress, 478 PBYTE abyDestAddress,
479 IN WORD wReason, 479 WORD wReason,
480 OUT PCMD_STATUS pStatus 480 OUT PCMD_STATUS pStatus
481 ); 481 );
482 482
483BOOL 483BOOL
484bMgrPrepareBeaconToSend( 484bMgrPrepareBeaconToSend(
485 IN void *hDeviceContext, 485 void *hDeviceContext,
486 IN PSMgmtObject pMgmt 486 PSMgmtObject pMgmt
487 ); 487 );
488 488
489 489
490BOOL 490BOOL
491bAdd_PMKID_Candidate ( 491bAdd_PMKID_Candidate (
492 IN void *hDeviceContext, 492 void *hDeviceContext,
493 IN PBYTE pbyBSSID, 493 PBYTE pbyBSSID,
494 IN PSRSNCapObject psRSNCapObj 494 PSRSNCapObject psRSNCapObj
495 ); 495 );
496 496
497void 497void
498vFlush_PMKID_Candidate ( 498vFlush_PMKID_Candidate (
499 IN void *hDeviceContext 499 void *hDeviceContext
500 ); 500 );
501 501
502#endif // __WMGR_H__ 502#endif // __WMGR_H__
diff --git a/drivers/staging/vt6655/wpa.c b/drivers/staging/vt6655/wpa.c
index 75ae83814d8..da5c814e200 100644
--- a/drivers/staging/vt6655/wpa.c
+++ b/drivers/staging/vt6655/wpa.c
@@ -70,7 +70,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 };
70 70
71void 71void
72WPA_ClearRSN ( 72WPA_ClearRSN (
73 IN PKnownBSS pBSSList 73 PKnownBSS pBSSList
74 ) 74 )
75{ 75{
76 int ii; 76 int ii;
@@ -106,8 +106,8 @@ WPA_ClearRSN (
106-*/ 106-*/
107void 107void
108WPA_ParseRSN ( 108WPA_ParseRSN (
109 IN PKnownBSS pBSSList, 109 PKnownBSS pBSSList,
110 IN PWLAN_IE_RSN_EXT pRSN 110 PWLAN_IE_RSN_EXT pRSN
111 ) 111 )
112{ 112{
113 PWLAN_IE_RSN_AUTH pIE_RSN_Auth = NULL; 113 PWLAN_IE_RSN_AUTH pIE_RSN_Auth = NULL;
@@ -241,7 +241,7 @@ BOOL
241WPA_SearchRSN ( 241WPA_SearchRSN (
242 BYTE byCmd, 242 BYTE byCmd,
243 BYTE byEncrypt, 243 BYTE byEncrypt,
244 IN PKnownBSS pBSSList 244 PKnownBSS pBSSList
245 ) 245 )
246{ 246{
247 int ii; 247 int ii;
@@ -299,7 +299,7 @@ WPA_SearchRSN (
299-*/ 299-*/
300BOOL 300BOOL
301WPAb_Is_RSN ( 301WPAb_Is_RSN (
302 IN PWLAN_IE_RSN_EXT pRSN 302 PWLAN_IE_RSN_EXT pRSN
303 ) 303 )
304{ 304{
305 if (pRSN == NULL) 305 if (pRSN == NULL)
diff --git a/drivers/staging/vt6655/wpa.h b/drivers/staging/vt6655/wpa.h
index d77c7bb2274..80d990b09d2 100644
--- a/drivers/staging/vt6655/wpa.h
+++ b/drivers/staging/vt6655/wpa.h
@@ -60,25 +60,25 @@
60 60
61void 61void
62WPA_ClearRSN( 62WPA_ClearRSN(
63 IN PKnownBSS pBSSList 63 PKnownBSS pBSSList
64 ); 64 );
65 65
66void 66void
67WPA_ParseRSN( 67WPA_ParseRSN(
68 IN PKnownBSS pBSSList, 68 PKnownBSS pBSSList,
69 IN PWLAN_IE_RSN_EXT pRSN 69 PWLAN_IE_RSN_EXT pRSN
70 ); 70 );
71 71
72BOOL 72BOOL
73WPA_SearchRSN( 73WPA_SearchRSN(
74 BYTE byCmd, 74 BYTE byCmd,
75 BYTE byEncrypt, 75 BYTE byEncrypt,
76 IN PKnownBSS pBSSList 76 PKnownBSS pBSSList
77 ); 77 );
78 78
79BOOL 79BOOL
80WPAb_Is_RSN( 80WPAb_Is_RSN(
81 IN PWLAN_IE_RSN_EXT pRSN 81 PWLAN_IE_RSN_EXT pRSN
82 ); 82 );
83 83
84#endif // __WPA_H__ 84#endif // __WPA_H__
diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c
index 3f377b6a2ba..102a18a835b 100644
--- a/drivers/staging/vt6655/wpa2.c
+++ b/drivers/staging/vt6655/wpa2.c
@@ -74,7 +74,7 @@ const BYTE abyOUIPSK[4] = { 0x00, 0x0F, 0xAC, 0x02 };
74-*/ 74-*/
75void 75void
76WPA2_ClearRSN ( 76WPA2_ClearRSN (
77 IN PKnownBSS pBSSNode 77 PKnownBSS pBSSNode
78 ) 78 )
79{ 79{
80 int ii; 80 int ii;
@@ -109,8 +109,8 @@ WPA2_ClearRSN (
109-*/ 109-*/
110void 110void
111WPA2vParseRSN ( 111WPA2vParseRSN (
112 IN PKnownBSS pBSSNode, 112 PKnownBSS pBSSNode,
113 IN PWLAN_IE_RSN pRSN 113 PWLAN_IE_RSN pRSN
114 ) 114 )
115{ 115{
116 int i, j; 116 int i, j;
@@ -263,7 +263,7 @@ WPA2vParseRSN (
263-*/ 263-*/
264UINT 264UINT
265WPA2uSetIEs( 265WPA2uSetIEs(
266 IN void *pMgmtHandle, 266 void *pMgmtHandle,
267 OUT PWLAN_IE_RSN pRSNIEs 267 OUT PWLAN_IE_RSN pRSNIEs
268 ) 268 )
269{ 269{
diff --git a/drivers/staging/vt6655/wpa2.h b/drivers/staging/vt6655/wpa2.h
index 7becc749c9f..1f2a02d2a57 100644
--- a/drivers/staging/vt6655/wpa2.h
+++ b/drivers/staging/vt6655/wpa2.h
@@ -60,18 +60,18 @@ typedef struct tagSPMKIDCache {
60 60
61void 61void
62WPA2_ClearRSN ( 62WPA2_ClearRSN (
63 IN PKnownBSS pBSSNode 63 PKnownBSS pBSSNode
64 ); 64 );
65 65
66void 66void
67WPA2vParseRSN ( 67WPA2vParseRSN (
68 IN PKnownBSS pBSSNode, 68 PKnownBSS pBSSNode,
69 IN PWLAN_IE_RSN pRSN 69 PWLAN_IE_RSN pRSN
70 ); 70 );
71 71
72UINT 72UINT
73WPA2uSetIEs( 73WPA2uSetIEs(
74 IN void *pMgmtHandle, 74 void *pMgmtHandle,
75 OUT PWLAN_IE_RSN pRSNIEs 75 OUT PWLAN_IE_RSN pRSNIEs
76 ); 76 );
77 77
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-11 08:27:54 -0500