aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Clément <caratorn@gmail.com>2010-05-12 17:14:00 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-14 16:20:35 -0400
commite64354c0be3b7134c85571a525b2e37fc4a95eef (patch)
tree3a04de7f590cd7be5147fa892aa5bdf7381fc099
parent089a41985c6c7e69c8fe043c0dd397da628254f5 (diff)
Staging: vt6655: remove HANDLE definition and use
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/baseband.c4
-rw-r--r--drivers/staging/vt6655/baseband.h4
-rw-r--r--drivers/staging/vt6655/bssdb.c72
-rw-r--r--drivers/staging/vt6655/bssdb.h32
-rw-r--r--drivers/staging/vt6655/device_main.c24
-rw-r--r--drivers/staging/vt6655/dpc.c10
-rw-r--r--drivers/staging/vt6655/ioctl.c14
-rw-r--r--drivers/staging/vt6655/iwctl.c26
-rw-r--r--drivers/staging/vt6655/power.c12
-rw-r--r--drivers/staging/vt6655/power.h12
-rw-r--r--drivers/staging/vt6655/ttype.h2
-rw-r--r--drivers/staging/vt6655/wcmd.c58
-rw-r--r--drivers/staging/vt6655/wcmd.h12
-rw-r--r--drivers/staging/vt6655/wmgr.c70
-rw-r--r--drivers/staging/vt6655/wmgr.h30
-rw-r--r--drivers/staging/vt6655/wpactl.c12
16 files changed, 196 insertions, 198 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c
index 16d7db350bb..7a69490fc7e 100644
--- a/drivers/staging/vt6655/baseband.c
+++ b/drivers/staging/vt6655/baseband.c
@@ -2878,7 +2878,7 @@ BBvAntennaDiversity (PSDevice pDevice, BYTE byRxRate, BYTE bySQ3)
2878 2878
2879void 2879void
2880TimerSQ3CallBack ( 2880TimerSQ3CallBack (
2881 IN HANDLE hDeviceContext 2881 IN 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 HANDLE hDeviceContext 2929 IN 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 de9b84acd6a..23f7ad151d1 100644
--- a/drivers/staging/vt6655/baseband.h
+++ b/drivers/staging/vt6655/baseband.h
@@ -162,12 +162,12 @@ void BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);
162 162
163void 163void
164TimerSQ3CallBack ( 164TimerSQ3CallBack (
165 IN HANDLE hDeviceContext 165 IN void *hDeviceContext
166 ); 166 );
167 167
168void 168void
169TimerState1CallBack( 169TimerState1CallBack(
170 IN HANDLE hDeviceContext 170 IN 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 e7bbc56f0c8..3af0ccb25d0 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 HANDLE hDeviceContext 94 IN void *hDeviceContext
95 ); 95 );
96 96
97#ifdef Calcu_LinkQual 97#ifdef Calcu_LinkQual
98void s_uCalculateLinkQual( 98void s_uCalculateLinkQual(
99 IN HANDLE hDeviceContext 99 IN void *hDeviceContext
100 ); 100 );
101#endif 101#endif
102 102
103 103
104void s_vCheckPreEDThreshold( 104void s_vCheckPreEDThreshold(
105 IN HANDLE hDeviceContext 105 IN void *hDeviceContext
106 ); 106 );
107/*--------------------- Export Variables --------------------------*/ 107/*--------------------- Export Variables --------------------------*/
108 108
@@ -125,7 +125,7 @@ void s_vCheckPreEDThreshold(
125 125
126PKnownBSS 126PKnownBSS
127BSSpSearchBSSList( 127BSSpSearchBSSList(
128 IN HANDLE hDeviceContext, 128 IN void *hDeviceContext,
129 IN PBYTE pbyDesireBSSID, 129 IN PBYTE pbyDesireBSSID,
130 IN PBYTE pbyDesireSSID, 130 IN PBYTE pbyDesireSSID,
131 IN CARD_PHY_TYPE ePhyType 131 IN CARD_PHY_TYPE ePhyType
@@ -282,7 +282,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE;
282 282
283void 283void
284BSSvClearBSSList( 284BSSvClearBSSList(
285 IN HANDLE hDeviceContext, 285 IN void *hDeviceContext,
286 IN BOOL bKeepCurrBSSID 286 IN BOOL bKeepCurrBSSID
287 ) 287 )
288{ 288{
@@ -325,7 +325,7 @@ BSSvClearBSSList(
325-*/ 325-*/
326PKnownBSS 326PKnownBSS
327BSSpAddrIsInBSSList( 327BSSpAddrIsInBSSList(
328 IN HANDLE hDeviceContext, 328 IN void *hDeviceContext,
329 IN PBYTE abyBSSID, 329 IN PBYTE abyBSSID,
330 IN PWLAN_IE_SSID pSSID 330 IN PWLAN_IE_SSID pSSID
331 ) 331 )
@@ -368,7 +368,7 @@ BSSpAddrIsInBSSList(
368 368
369BOOL 369BOOL
370BSSbInsertToBSSList ( 370BSSbInsertToBSSList (
371 IN HANDLE hDeviceContext, 371 IN void *hDeviceContext,
372 IN PBYTE abyBSSIDAddr, 372 IN PBYTE abyBSSIDAddr,
373 IN QWORD qwTimestamp, 373 IN QWORD qwTimestamp,
374 IN WORD wBeaconInterval, 374 IN WORD wBeaconInterval,
@@ -384,7 +384,7 @@ BSSbInsertToBSSList (
384 IN PWLAN_IE_QUIET pIE_Quiet, 384 IN PWLAN_IE_QUIET pIE_Quiet,
385 IN UINT uIELength, 385 IN UINT uIELength,
386 IN PBYTE pbyIEs, 386 IN PBYTE pbyIEs,
387 IN HANDLE pRxPacketContext 387 IN void *pRxPacketContext
388 ) 388 )
389{ 389{
390 390
@@ -502,7 +502,7 @@ BSSbInsertToBSSList (
502 if ((bIs802_1x == TRUE) && (pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len) && 502 if ((bIs802_1x == TRUE) && (pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len) &&
503 ( !memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID, pSSID->len))) { 503 ( !memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID, pSSID->len))) {
504 504
505 bAdd_PMKID_Candidate((HANDLE)pDevice, pBSSList->abyBSSID, &pBSSList->sRSNCapObj); 505 bAdd_PMKID_Candidate((void *)pDevice, pBSSList->abyBSSID, &pBSSList->sRSNCapObj);
506 506
507 if ((pDevice->bLinkPass == TRUE) && (pMgmt->eCurrState == WMAC_STATE_ASSOC)) { 507 if ((pDevice->bLinkPass == TRUE) && (pMgmt->eCurrState == WMAC_STATE_ASSOC)) {
508 if ((KeybGetTransmitKey(&(pDevice->sKey), pDevice->abyBSSID, PAIRWISE_KEY, &pTransmitKey) == TRUE) || 508 if ((KeybGetTransmitKey(&(pDevice->sKey), pDevice->abyBSSID, PAIRWISE_KEY, &pTransmitKey) == TRUE) ||
@@ -585,7 +585,7 @@ BSSbInsertToBSSList (
585 585
586BOOL 586BOOL
587BSSbUpdateToBSSList ( 587BSSbUpdateToBSSList (
588 IN HANDLE hDeviceContext, 588 IN void *hDeviceContext,
589 IN QWORD qwTimestamp, 589 IN QWORD qwTimestamp,
590 IN WORD wBeaconInterval, 590 IN WORD wBeaconInterval,
591 IN WORD wCapInfo, 591 IN WORD wCapInfo,
@@ -602,7 +602,7 @@ BSSbUpdateToBSSList (
602 IN PKnownBSS pBSSList, 602 IN PKnownBSS pBSSList,
603 IN UINT uIELength, 603 IN UINT uIELength,
604 IN PBYTE pbyIEs, 604 IN PBYTE pbyIEs,
605 IN HANDLE pRxPacketContext 605 IN void *pRxPacketContext
606 ) 606 )
607{ 607{
608 int ii; 608 int ii;
@@ -799,7 +799,7 @@ BSSDBbIsSTAInNodeDB(
799-*/ 799-*/
800void 800void
801BSSvCreateOneNode( 801BSSvCreateOneNode(
802 IN HANDLE hDeviceContext, 802 IN void *hDeviceContext,
803 OUT PUINT puNodeIndex 803 OUT PUINT puNodeIndex
804 ) 804 )
805{ 805{
@@ -864,7 +864,7 @@ BSSvCreateOneNode(
864-*/ 864-*/
865void 865void
866BSSvRemoveOneNode( 866BSSvRemoveOneNode(
867 IN HANDLE hDeviceContext, 867 IN void *hDeviceContext,
868 IN UINT uNodeIndex 868 IN UINT uNodeIndex
869 ) 869 )
870{ 870{
@@ -897,7 +897,7 @@ BSSvRemoveOneNode(
897 897
898void 898void
899BSSvUpdateAPNode( 899BSSvUpdateAPNode(
900 IN HANDLE hDeviceContext, 900 IN void *hDeviceContext,
901 IN PWORD pwCapInfo, 901 IN PWORD pwCapInfo,
902 IN PWLAN_IE_SUPP_RATES pSuppRates, 902 IN PWLAN_IE_SUPP_RATES pSuppRates,
903 IN PWLAN_IE_SUPP_RATES pExtSuppRates 903 IN PWLAN_IE_SUPP_RATES pExtSuppRates
@@ -960,7 +960,7 @@ BSSvUpdateAPNode(
960 960
961void 961void
962BSSvAddMulticastNode( 962BSSvAddMulticastNode(
963 IN HANDLE hDeviceContext 963 IN 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 HANDLE hDeviceContext 1016 IN void *hDeviceContext
1017 ) 1017 )
1018{ 1018{
1019 PSDevice pDevice = (PSDevice)hDeviceContext; 1019 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1111,7 +1111,7 @@ start:
1111} 1111}
1112 1112
1113#ifdef Calcu_LinkQual 1113#ifdef Calcu_LinkQual
1114 s_uCalculateLinkQual((HANDLE)pDevice); 1114 s_uCalculateLinkQual((void *)pDevice);
1115#endif 1115#endif
1116 1116
1117 for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) { 1117 for (ii = 0; ii < (MAX_NODE_NUM + 1); ii++) {
@@ -1261,18 +1261,18 @@ start:
1261 if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS 1261 if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS
1262 // DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount); 1262 // DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount);
1263 //if (pDevice->bUpdateBBVGA) { 1263 //if (pDevice->bUpdateBBVGA) {
1264 // s_vCheckSensitivity((HANDLE) pDevice); 1264 // s_vCheckSensitivity((void *) pDevice);
1265 //} 1265 //}
1266 1266
1267 if (pDevice->bUpdateBBVGA) { 1267 if (pDevice->bUpdateBBVGA) {
1268 // s_vCheckSensitivity((HANDLE) pDevice); 1268 // s_vCheckSensitivity((void *) pDevice);
1269 s_vCheckPreEDThreshold((HANDLE)pDevice); 1269 s_vCheckPreEDThreshold((void *)pDevice);
1270 } 1270 }
1271 1271
1272 if ((pMgmt->sNodeDBTable[0].uInActiveCount >= (LOST_BEACON_COUNT/2)) && 1272 if ((pMgmt->sNodeDBTable[0].uInActiveCount >= (LOST_BEACON_COUNT/2)) &&
1273 (pDevice->byBBVGACurrent != pDevice->abyBBVGA[0]) ) { 1273 (pDevice->byBBVGACurrent != pDevice->abyBBVGA[0]) ) {
1274 pDevice->byBBVGANew = pDevice->abyBBVGA[0]; 1274 pDevice->byBBVGANew = pDevice->abyBBVGA[0];
1275 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL); 1275 bScheduleCommand((void *) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL);
1276 } 1276 }
1277 1277
1278 if (pMgmt->sNodeDBTable[0].uInActiveCount >= LOST_BEACON_COUNT) { 1278 if (pMgmt->sNodeDBTable[0].uInActiveCount >= LOST_BEACON_COUNT) {
@@ -1324,10 +1324,10 @@ start:
1324 pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus; 1324 pDevice->eEncryptionStatus = pDevice->eOldEncryptionStatus;
1325 1325
1326 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming ...\n"); 1326 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Roaming ...\n");
1327 BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); 1327 BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
1328 pMgmt->eScanType = WMAC_SCAN_ACTIVE; 1328 pMgmt->eScanType = WMAC_SCAN_ACTIVE;
1329 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); 1329 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
1330 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID); 1330 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID);
1331 pDevice->uAutoReConnectTime = 0; 1331 pDevice->uAutoReConnectTime = 0;
1332 } 1332 }
1333 } 1333 }
@@ -1342,16 +1342,16 @@ start:
1342 else { 1342 else {
1343 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scaning ...\n"); 1343 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Adhoc re-scaning ...\n");
1344 pMgmt->eScanType = WMAC_SCAN_ACTIVE; 1344 pMgmt->eScanType = WMAC_SCAN_ACTIVE;
1345 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL); 1345 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
1346 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL); 1346 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
1347 pDevice->uAutoReConnectTime = 0; 1347 pDevice->uAutoReConnectTime = 0;
1348 }; 1348 };
1349 } 1349 }
1350 if (pMgmt->eCurrState == WMAC_STATE_JOINTED) { 1350 if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {
1351 1351
1352 if (pDevice->bUpdateBBVGA) { 1352 if (pDevice->bUpdateBBVGA) {
1353 //s_vCheckSensitivity((HANDLE) pDevice); 1353 //s_vCheckSensitivity((void *) pDevice);
1354 s_vCheckPreEDThreshold((HANDLE)pDevice); 1354 s_vCheckPreEDThreshold((void *)pDevice);
1355 } 1355 }
1356 if (pMgmt->sNodeDBTable[0].uInActiveCount >=ADHOC_LOST_BEACON_COUNT) { 1356 if (pMgmt->sNodeDBTable[0].uInActiveCount >=ADHOC_LOST_BEACON_COUNT) {
1357 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount); 1357 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost other STA beacon [%d] sec, started !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
@@ -1390,7 +1390,7 @@ start:
1390 1390
1391void 1391void
1392BSSvUpdateNodeTxCounter( 1392BSSvUpdateNodeTxCounter(
1393 IN HANDLE hDeviceContext, 1393 IN void *hDeviceContext,
1394 IN BYTE byTsr0, 1394 IN BYTE byTsr0,
1395 IN BYTE byTsr1, 1395 IN BYTE byTsr1,
1396 IN PBYTE pbyBuffer, 1396 IN PBYTE pbyBuffer,
@@ -1503,7 +1503,7 @@ BSSvUpdateNodeTxCounter(
1503 1503
1504 pMACHeader = (PS802_11Header)(pbyBuffer + uFIFOHeaderSize); 1504 pMACHeader = (PS802_11Header)(pbyBuffer + uFIFOHeaderSize);
1505 1505
1506 if (BSSDBbIsSTAInNodeDB((HANDLE)pMgmt, &(pMACHeader->abyAddr1[0]), &uNodeIndex)){ 1506 if (BSSDBbIsSTAInNodeDB((void *)pMgmt, &(pMACHeader->abyAddr1[0]), &uNodeIndex)){
1507 pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts += 1; 1507 pMgmt->sNodeDBTable[uNodeIndex].uTxAttempts += 1;
1508 if ((byTsr1 & TSR1_TERR) == 0) { 1508 if ((byTsr1 & TSR1_TERR) == 0) {
1509 // transmit success, TxAttempts at least plus one 1509 // transmit success, TxAttempts at least plus one
@@ -1583,7 +1583,7 @@ BSSvUpdateNodeTxCounter(
1583 1583
1584void 1584void
1585BSSvClearNodeDBTable( 1585BSSvClearNodeDBTable(
1586 IN HANDLE hDeviceContext, 1586 IN void *hDeviceContext,
1587 IN UINT uStartIndex 1587 IN UINT uStartIndex
1588 ) 1588 )
1589 1589
@@ -1611,7 +1611,7 @@ BSSvClearNodeDBTable(
1611 1611
1612 1612
1613void s_vCheckSensitivity( 1613void s_vCheckSensitivity(
1614 IN HANDLE hDeviceContext 1614 IN void *hDeviceContext
1615 ) 1615 )
1616{ 1616{
1617 PSDevice pDevice = (PSDevice)hDeviceContext; 1617 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -1649,7 +1649,7 @@ void s_vCheckSensitivity(
1649 if (pDevice->byBBVGANew != pDevice->byBBVGACurrent) { 1649 if (pDevice->byBBVGANew != pDevice->byBBVGACurrent) {
1650 pDevice->uBBVGADiffCount++; 1650 pDevice->uBBVGADiffCount++;
1651 if (pDevice->uBBVGADiffCount >= BB_VGA_CHANGE_THRESHOLD) 1651 if (pDevice->uBBVGADiffCount >= BB_VGA_CHANGE_THRESHOLD)
1652 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL); 1652 bScheduleCommand((void *) pDevice, WLAN_CMD_CHANGE_BBSENSITIVITY, NULL);
1653 } else { 1653 } else {
1654 pDevice->uBBVGADiffCount = 0; 1654 pDevice->uBBVGADiffCount = 0;
1655 } 1655 }
@@ -1661,7 +1661,7 @@ void s_vCheckSensitivity(
1661 1661
1662void 1662void
1663BSSvClearAnyBSSJoinRecord ( 1663BSSvClearAnyBSSJoinRecord (
1664 IN HANDLE hDeviceContext 1664 IN 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 HANDLE hDeviceContext 1679 IN 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 HANDLE hDeviceContext 1727 IN 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 86a1f673290..a66e14f0a82 100644
--- a/drivers/staging/vt6655/bssdb.h
+++ b/drivers/staging/vt6655/bssdb.h
@@ -244,7 +244,7 @@ typedef struct tagKnownNodeDB {
244 244
245PKnownBSS 245PKnownBSS
246BSSpSearchBSSList( 246BSSpSearchBSSList(
247 IN HANDLE hDeviceContext, 247 IN void *hDeviceContext,
248 IN PBYTE pbyDesireBSSID, 248 IN PBYTE pbyDesireBSSID,
249 IN PBYTE pbyDesireSSID, 249 IN PBYTE pbyDesireSSID,
250 IN CARD_PHY_TYPE ePhyType 250 IN CARD_PHY_TYPE ePhyType
@@ -252,20 +252,20 @@ BSSpSearchBSSList(
252 252
253PKnownBSS 253PKnownBSS
254BSSpAddrIsInBSSList( 254BSSpAddrIsInBSSList(
255 IN HANDLE hDeviceContext, 255 IN void *hDeviceContext,
256 IN PBYTE abyBSSID, 256 IN PBYTE abyBSSID,
257 IN PWLAN_IE_SSID pSSID 257 IN PWLAN_IE_SSID pSSID
258 ); 258 );
259 259
260void 260void
261BSSvClearBSSList( 261BSSvClearBSSList(
262 IN HANDLE hDeviceContext, 262 IN void *hDeviceContext,
263 IN BOOL bKeepCurrBSSID 263 IN BOOL bKeepCurrBSSID
264 ); 264 );
265 265
266BOOL 266BOOL
267BSSbInsertToBSSList( 267BSSbInsertToBSSList(
268 IN HANDLE hDeviceContext, 268 IN void *hDeviceContext,
269 IN PBYTE abyBSSIDAddr, 269 IN PBYTE abyBSSIDAddr,
270 IN QWORD qwTimestamp, 270 IN QWORD qwTimestamp,
271 IN WORD wBeaconInterval, 271 IN WORD wBeaconInterval,
@@ -281,13 +281,13 @@ BSSbInsertToBSSList(
281 IN PWLAN_IE_QUIET pIE_Quiet, 281 IN PWLAN_IE_QUIET pIE_Quiet,
282 IN UINT uIELength, 282 IN UINT uIELength,
283 IN PBYTE pbyIEs, 283 IN PBYTE pbyIEs,
284 IN HANDLE pRxPacketContext 284 IN void *pRxPacketContext
285 ); 285 );
286 286
287 287
288BOOL 288BOOL
289BSSbUpdateToBSSList( 289BSSbUpdateToBSSList(
290 IN HANDLE hDeviceContext, 290 IN void *hDeviceContext,
291 IN QWORD qwTimestamp, 291 IN QWORD qwTimestamp,
292 IN WORD wBeaconInterval, 292 IN WORD wBeaconInterval,
293 IN WORD wCapInfo, 293 IN WORD wCapInfo,
@@ -304,26 +304,26 @@ BSSbUpdateToBSSList(
304 IN PKnownBSS pBSSList, 304 IN PKnownBSS pBSSList,
305 IN UINT uIELength, 305 IN UINT uIELength,
306 IN PBYTE pbyIEs, 306 IN PBYTE pbyIEs,
307 IN HANDLE pRxPacketContext 307 IN void *pRxPacketContext
308 ); 308 );
309 309
310 310
311BOOL 311BOOL
312BSSDBbIsSTAInNodeDB( 312BSSDBbIsSTAInNodeDB(
313 IN HANDLE hDeviceContext, 313 IN void *hDeviceContext,
314 IN PBYTE abyDstAddr, 314 IN PBYTE abyDstAddr,
315 OUT PUINT puNodeIndex 315 OUT PUINT puNodeIndex
316 ); 316 );
317 317
318void 318void
319BSSvCreateOneNode( 319BSSvCreateOneNode(
320 IN HANDLE hDeviceContext, 320 IN void *hDeviceContext,
321 OUT PUINT puNodeIndex 321 OUT PUINT puNodeIndex
322 ); 322 );
323 323
324void 324void
325BSSvUpdateAPNode( 325BSSvUpdateAPNode(
326 IN HANDLE hDeviceContext, 326 IN void *hDeviceContext,
327 IN PWORD pwCapInfo, 327 IN PWORD pwCapInfo,
328 IN PWLAN_IE_SUPP_RATES pItemRates, 328 IN PWLAN_IE_SUPP_RATES pItemRates,
329 IN PWLAN_IE_SUPP_RATES pExtSuppRates 329 IN PWLAN_IE_SUPP_RATES pExtSuppRates
@@ -332,13 +332,13 @@ BSSvUpdateAPNode(
332 332
333void 333void
334BSSvSecondCallBack( 334BSSvSecondCallBack(
335 IN HANDLE hDeviceContext 335 IN void *hDeviceContext
336 ); 336 );
337 337
338 338
339void 339void
340BSSvUpdateNodeTxCounter( 340BSSvUpdateNodeTxCounter(
341 IN HANDLE hDeviceContext, 341 IN void *hDeviceContext,
342 IN BYTE byTsr0, 342 IN BYTE byTsr0,
343 IN BYTE byTsr1, 343 IN BYTE byTsr1,
344 IN PBYTE pbyBuffer, 344 IN PBYTE pbyBuffer,
@@ -347,25 +347,25 @@ BSSvUpdateNodeTxCounter(
347 347
348void 348void
349BSSvRemoveOneNode( 349BSSvRemoveOneNode(
350 IN HANDLE hDeviceContext, 350 IN void *hDeviceContext,
351 IN UINT uNodeIndex 351 IN UINT uNodeIndex
352 ); 352 );
353 353
354void 354void
355BSSvAddMulticastNode( 355BSSvAddMulticastNode(
356 IN HANDLE hDeviceContext 356 IN void *hDeviceContext
357 ); 357 );
358 358
359 359
360void 360void
361BSSvClearNodeDBTable( 361BSSvClearNodeDBTable(
362 IN HANDLE hDeviceContext, 362 IN void *hDeviceContext,
363 IN UINT uStartIndex 363 IN UINT uStartIndex
364 ); 364 );
365 365
366void 366void
367BSSvClearAnyBSSJoinRecord( 367BSSvClearAnyBSSJoinRecord(
368 IN HANDLE hDeviceContext 368 IN void *hDeviceContext
369 ); 369 );
370 370
371#endif //__BSSDB_H__ 371#endif //__BSSDB_H__
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index f690fc2c35c..454277b96ee 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -2011,11 +2011,11 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "call MACvIntEnable\n");
2011 MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); 2011 MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
2012 2012
2013 if (pDevice->pMgmt->eConfigMode == WMAC_CONFIG_AP) { 2013 if (pDevice->pMgmt->eConfigMode == WMAC_CONFIG_AP) {
2014 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RUN_AP, NULL); 2014 bScheduleCommand((void *)pDevice, WLAN_CMD_RUN_AP, NULL);
2015 } 2015 }
2016 else { 2016 else {
2017 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_BSSID_SCAN, NULL); 2017 bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL);
2018 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_SSID, NULL); 2018 bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);
2019 } 2019 }
2020 pDevice->flags |=DEVICE_FLAGS_OPENED; 2020 pDevice->flags |=DEVICE_FLAGS_OPENED;
2021 2021
@@ -2034,7 +2034,7 @@ static int device_close(struct net_device *dev) {
2034//PLICE_DEBUG<- 2034//PLICE_DEBUG<-
2035//2007-1121-02<Add>by EinsnLiu 2035//2007-1121-02<Add>by EinsnLiu
2036 if (pDevice->bLinkPass) { 2036 if (pDevice->bLinkPass) {
2037 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_DISASSOCIATE, NULL); 2037 bScheduleCommand((void *)pDevice, WLAN_CMD_DISASSOCIATE, NULL);
2038 mdelay(30); 2038 mdelay(30);
2039 } 2039 }
2040#ifdef TxInSleep 2040#ifdef TxInSleep
@@ -2860,7 +2860,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
2860 2860
2861 pDevice->bBeaconSent = FALSE; 2861 pDevice->bBeaconSent = FALSE;
2862 if (pDevice->bEnablePSMode) { 2862 if (pDevice->bEnablePSMode) {
2863 PSbIsNextTBTTWakeUp((HANDLE)pDevice); 2863 PSbIsNextTBTTWakeUp((void *)pDevice);
2864 }; 2864 };
2865 2865
2866 if ((pDevice->eOPMode == OP_MODE_AP) || 2866 if ((pDevice->eOPMode == OP_MODE_AP) ||
@@ -2893,7 +2893,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {
2893 // check if mutltcast tx bufferring 2893 // check if mutltcast tx bufferring
2894 pMgmt->byDTIMCount = pMgmt->byDTIMPeriod - 1; 2894 pMgmt->byDTIMCount = pMgmt->byDTIMPeriod - 1;
2895 pMgmt->sNodeDBTable[0].bRxPSPoll = TRUE; 2895 pMgmt->sNodeDBTable[0].bRxPSPoll = TRUE;
2896 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL); 2896 bScheduleCommand((void *)pDevice, WLAN_CMD_RX_PSPOLL, NULL);
2897 } 2897 }
2898 } 2898 }
2899 } 2899 }
@@ -3549,7 +3549,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3549 if (pMgmt->eConfigMode == WMAC_CONFIG_AP) { 3549 if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
3550 netif_stop_queue(pDevice->dev); 3550 netif_stop_queue(pDevice->dev);
3551 spin_lock_irq(&pDevice->lock); 3551 spin_lock_irq(&pDevice->lock);
3552 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RUN_AP, NULL); 3552 bScheduleCommand((void *)pDevice, WLAN_CMD_RUN_AP, NULL);
3553 spin_unlock_irq(&pDevice->lock); 3553 spin_unlock_irq(&pDevice->lock);
3554 } 3554 }
3555 else { 3555 else {
@@ -3563,8 +3563,8 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
3563 pMgmt->eScanType = WMAC_SCAN_ACTIVE; 3563 pMgmt->eScanType = WMAC_SCAN_ACTIVE;
3564 if(pDevice->bWPASuppWextEnabled !=TRUE) 3564 if(pDevice->bWPASuppWextEnabled !=TRUE)
3565 #endif 3565 #endif
3566 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); 3566 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
3567 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL); 3567 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
3568 spin_unlock_irq(&pDevice->lock); 3568 spin_unlock_irq(&pDevice->lock);
3569 } 3569 }
3570 pDevice->bCommit = FALSE; 3570 pDevice->bCommit = FALSE;
@@ -3719,9 +3719,9 @@ viawget_resume(struct pci_dev *pcid)
3719 init_timer(&pMgmt->sTimerSecondCallback); 3719 init_timer(&pMgmt->sTimerSecondCallback);
3720 init_timer(&pDevice->sTimerCommand); 3720 init_timer(&pDevice->sTimerCommand);
3721 MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE); 3721 MACvIntEnable(pDevice->PortOffset, IMR_MASK_VALUE);
3722 BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); 3722 BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
3723 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL); 3723 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
3724 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL); 3724 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
3725 spin_unlock_irq(&pDevice->lock); 3725 spin_unlock_irq(&pDevice->lock);
3726 } 3726 }
3727 return 0; 3727 return 0;
diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index ab13bdfc51b..d90104a1e6b 100644
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -631,13 +631,13 @@ device_receive_frame (
631 tasklet_schedule(&pDevice->RxMngWorkItem); 631 tasklet_schedule(&pDevice->RxMngWorkItem);
632#else 632#else
633//printk("RxMan\n"); 633//printk("RxMan\n");
634 vMgrRxManagePacket((HANDLE)pDevice, pDevice->pMgmt, pRxPacket); 634 vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket);
635 //tasklet_schedule(&pDevice->RxMngWorkItem); 635 //tasklet_schedule(&pDevice->RxMngWorkItem);
636#endif 636#endif
637 637
638#endif 638#endif
639//PLICE_DEBUG<- 639//PLICE_DEBUG<-
640 //vMgrRxManagePacket((HANDLE)pDevice, pDevice->pMgmt, pRxPacket); 640 //vMgrRxManagePacket((void *)pDevice, pDevice->pMgmt, pRxPacket);
641 // hostap Deamon handle 802.11 management 641 // hostap Deamon handle 802.11 management
642 if (pDevice->bEnableHostapd) { 642 if (pDevice->bEnableHostapd) {
643 skb->dev = pDevice->apdev; 643 skb->dev = pDevice->apdev;
@@ -1087,7 +1087,7 @@ static BOOL s_bAPModeRxCtl (
1087 // delcare received ps-poll event 1087 // delcare received ps-poll event
1088 if (IS_CTL_PSPOLL(pbyFrame)) { 1088 if (IS_CTL_PSPOLL(pbyFrame)) {
1089 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE; 1089 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE;
1090 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL); 1090 bScheduleCommand((void *)pDevice, WLAN_CMD_RX_PSPOLL, NULL);
1091 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 1\n"); 1091 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 1\n");
1092 } 1092 }
1093 else { 1093 else {
@@ -1096,7 +1096,7 @@ static BOOL s_bAPModeRxCtl (
1096 if (!IS_FC_POWERMGT(pbyFrame)) { 1096 if (!IS_FC_POWERMGT(pbyFrame)) {
1097 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE; 1097 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE;
1098 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE; 1098 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE;
1099 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL); 1099 bScheduleCommand((void *)pDevice, WLAN_CMD_RX_PSPOLL, NULL);
1100 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 2\n"); 1100 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 2\n");
1101 } 1101 }
1102 } 1102 }
@@ -1112,7 +1112,7 @@ static BOOL s_bAPModeRxCtl (
1112 if (pMgmt->sNodeDBTable[iSANodeIndex].wEnQueueCnt > 0) { 1112 if (pMgmt->sNodeDBTable[iSANodeIndex].wEnQueueCnt > 0) {
1113 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE; 1113 pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable = FALSE;
1114 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE; 1114 pMgmt->sNodeDBTable[iSANodeIndex].bRxPSPoll = TRUE;
1115 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RX_PSPOLL, NULL); 1115 bScheduleCommand((void *)pDevice, WLAN_CMD_RX_PSPOLL, NULL);
1116 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 3\n"); 1116 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: WLAN_CMD_RX_PSPOLL 3\n");
1117 1117
1118 } 1118 }
diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
index 86439bb629f..1bd819946b8 100644
--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@@ -109,14 +109,14 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
109 } 109 }
110 spin_lock_irq(&pDevice->lock); 110 spin_lock_irq(&pDevice->lock);
111 if (memcmp(pMgmt->abyCurrBSSID, &abyNullAddr[0], 6) == 0) 111 if (memcmp(pMgmt->abyCurrBSSID, &abyNullAddr[0], 6) == 0)
112 BSSvClearBSSList((HANDLE)pDevice, FALSE); 112 BSSvClearBSSList((void *)pDevice, FALSE);
113 else 113 else
114 BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); 114 BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
115 115
116 if (pItemSSID->len != 0) 116 if (pItemSSID->len != 0)
117 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID); 117 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID);
118 else 118 else
119 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL); 119 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
120 spin_unlock_irq(&pDevice->lock); 120 spin_unlock_irq(&pDevice->lock);
121 break; 121 break;
122 122
@@ -223,8 +223,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
223 netif_stop_queue(pDevice->dev); 223 netif_stop_queue(pDevice->dev);
224 spin_lock_irq(&pDevice->lock); 224 spin_lock_irq(&pDevice->lock);
225 pMgmt->eCurrState = WMAC_STATE_IDLE; 225 pMgmt->eCurrState = WMAC_STATE_IDLE;
226 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); 226 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
227 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL); 227 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
228 spin_unlock_irq(&pDevice->lock); 228 spin_unlock_irq(&pDevice->lock);
229 break; 229 break;
230 230
@@ -593,7 +593,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
593 593
594 netif_stop_queue(pDevice->dev); 594 netif_stop_queue(pDevice->dev);
595 spin_lock_irq(&pDevice->lock); 595 spin_lock_irq(&pDevice->lock);
596 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_RUN_AP, NULL); 596 bScheduleCommand((void *)pDevice, WLAN_CMD_RUN_AP, NULL);
597 spin_unlock_irq(&pDevice->lock); 597 spin_unlock_irq(&pDevice->lock);
598 break; 598 break;
599 599
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 7fa5842238b..cf69034fc0f 100644
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -190,7 +190,7 @@ if(pDevice->byReAssocCount > 0) { //reject scan when re-associating!
190} 190}
191 191
192 spin_lock_irq(&pDevice->lock); 192 spin_lock_irq(&pDevice->lock);
193 BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); 193 BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
194 194
195//mike add: active scan OR passive scan OR desire_ssid scan 195//mike add: active scan OR passive scan OR desire_ssid scan
196 if(wrq->length == sizeof(struct iw_scan_req)) { 196 if(wrq->length == sizeof(struct iw_scan_req)) {
@@ -208,7 +208,7 @@ if(pDevice->byReAssocCount > 0) { //reject scan when re-associating!
208 pMgmt->eScanType = WMAC_SCAN_PASSIVE; 208 pMgmt->eScanType = WMAC_SCAN_PASSIVE;
209 PRINT_K("SIOCSIWSCAN:[desired_ssid=%s,len=%d]\n",((PWLAN_IE_SSID)abyScanSSID)->abySSID, 209 PRINT_K("SIOCSIWSCAN:[desired_ssid=%s,len=%d]\n",((PWLAN_IE_SSID)abyScanSSID)->abySSID,
210 ((PWLAN_IE_SSID)abyScanSSID)->len); 210 ((PWLAN_IE_SSID)abyScanSSID)->len);
211 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID); 211 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID);
212 spin_unlock_irq(&pDevice->lock); 212 spin_unlock_irq(&pDevice->lock);
213 213
214 return 0; 214 return 0;
@@ -223,7 +223,7 @@ if(pDevice->byReAssocCount > 0) { //reject scan when re-associating!
223 223
224 pMgmt->eScanType = WMAC_SCAN_PASSIVE; 224 pMgmt->eScanType = WMAC_SCAN_PASSIVE;
225 //printk("SIOCSIWSCAN:WLAN_CMD_BSSID_SCAN\n"); 225 //printk("SIOCSIWSCAN:WLAN_CMD_BSSID_SCAN\n");
226 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL); 226 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
227 spin_unlock_irq(&pDevice->lock); 227 spin_unlock_irq(&pDevice->lock);
228 228
229 return 0; 229 return 0;
@@ -897,10 +897,10 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
897 897
898 if (pCurr == NULL){ 898 if (pCurr == NULL){
899 PRINT_K("SIOCSIWESSID:hidden ssid site survey before associate.......\n"); 899 PRINT_K("SIOCSIWESSID:hidden ssid site survey before associate.......\n");
900 vResetCommandTimer((HANDLE) pDevice); 900 vResetCommandTimer((void *) pDevice);
901 pMgmt->eScanType = WMAC_SCAN_ACTIVE; 901 pMgmt->eScanType = WMAC_SCAN_ACTIVE;
902 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); 902 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
903 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID); 903 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID);
904 } 904 }
905 else { //mike:to find out if that desired SSID is a hidden-ssid AP , 905 else { //mike:to find out if that desired SSID is a hidden-ssid AP ,
906 // by means of judging if there are two same BSSID exist in list ? 906 // by means of judging if there are two same BSSID exist in list ?
@@ -912,10 +912,10 @@ if (pMgmt->eScanState == WMAC_IS_SCANNING) {
912 } 912 }
913 if(uSameBssidNum >= 2) { //hit: desired AP is in hidden ssid mode!!! 913 if(uSameBssidNum >= 2) { //hit: desired AP is in hidden ssid mode!!!
914 printk("SIOCSIWESSID:hidden ssid directly associate.......\n"); 914 printk("SIOCSIWESSID:hidden ssid directly associate.......\n");
915 vResetCommandTimer((HANDLE) pDevice); 915 vResetCommandTimer((void *) pDevice);
916 pMgmt->eScanType = WMAC_SCAN_PASSIVE; //this scan type,you'll submit scan result! 916 pMgmt->eScanType = WMAC_SCAN_PASSIVE; //this scan type,you'll submit scan result!
917 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); 917 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
918 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID); 918 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, pMgmt->abyDesireSSID);
919 } 919 }
920 } 920 }
921 } 921 }
@@ -1660,11 +1660,11 @@ int iwctl_siwpower(struct net_device *dev,
1660 } 1660 }
1661 if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) { 1661 if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_TIMEOUT) {
1662 pDevice->ePSMode = WMAC_POWER_FAST; 1662 pDevice->ePSMode = WMAC_POWER_FAST;
1663 PSvEnablePowerSaving((HANDLE)pDevice, pMgmt->wListenInterval); 1663 PSvEnablePowerSaving((void *)pDevice, pMgmt->wListenInterval);
1664 1664
1665 } else if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_PERIOD) { 1665 } else if ((wrq->flags & IW_POWER_TYPE) == IW_POWER_PERIOD) {
1666 pDevice->ePSMode = WMAC_POWER_FAST; 1666 pDevice->ePSMode = WMAC_POWER_FAST;
1667 PSvEnablePowerSaving((HANDLE)pDevice, pMgmt->wListenInterval); 1667 PSvEnablePowerSaving((void *)pDevice, pMgmt->wListenInterval);
1668 } 1668 }
1669 switch (wrq->flags & IW_POWER_MODE) { 1669 switch (wrq->flags & IW_POWER_MODE) {
1670 case IW_POWER_UNICAST_R: 1670 case IW_POWER_UNICAST_R:
@@ -2096,7 +2096,7 @@ int iwctl_siwmlme(struct net_device *dev,
2096 switch(mlme->cmd){ 2096 switch(mlme->cmd){
2097 case IW_MLME_DEAUTH: 2097 case IW_MLME_DEAUTH:
2098 //this command seems to be not complete,please test it --einsnliu 2098 //this command seems to be not complete,please test it --einsnliu
2099 //bScheduleCommand((HANDLE) pDevice, WLAN_CMD_DEAUTH, (PBYTE)&reason); 2099 //bScheduleCommand((void *) pDevice, WLAN_CMD_DEAUTH, (PBYTE)&reason);
2100 break; 2100 break;
2101 case IW_MLME_DISASSOC: 2101 case IW_MLME_DISASSOC:
2102 if(pDevice->bLinkPass == TRUE){ 2102 if(pDevice->bLinkPass == TRUE){
@@ -2104,7 +2104,7 @@ int iwctl_siwmlme(struct net_device *dev,
2104 //clear related flags 2104 //clear related flags
2105 memset(pMgmt->abyDesireBSSID, 0xFF,6); 2105 memset(pMgmt->abyDesireBSSID, 0xFF,6);
2106 KeyvInitTable(&pDevice->sKey, pDevice->PortOffset); 2106 KeyvInitTable(&pDevice->sKey, pDevice->PortOffset);
2107 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_DISASSOCIATE, NULL); 2107 bScheduleCommand((void *)pDevice, WLAN_CMD_DISASSOCIATE, NULL);
2108 } 2108 }
2109 break; 2109 break;
2110 default: 2110 default:
diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c
index a28d03762e4..166e7fb638c 100644
--- a/drivers/staging/vt6655/power.c
+++ b/drivers/staging/vt6655/power.c
@@ -76,7 +76,7 @@ static int msglevel =MSG_LEVEL_INFO;
76 76
77void 77void
78PSvEnablePowerSaving( 78PSvEnablePowerSaving(
79 IN HANDLE hDeviceContext, 79 IN void *hDeviceContext,
80 IN WORD wListenInterval 80 IN WORD wListenInterval
81 ) 81 )
82{ 82{
@@ -146,7 +146,7 @@ PSvEnablePowerSaving(
146 146
147void 147void
148PSvDisablePowerSaving( 148PSvDisablePowerSaving(
149 IN HANDLE hDeviceContext 149 IN void *hDeviceContext
150 ) 150 )
151{ 151{
152 PSDevice pDevice = (PSDevice)hDeviceContext; 152 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -184,7 +184,7 @@ PSvDisablePowerSaving(
184 184
185BOOL 185BOOL
186PSbConsiderPowerDown( 186PSbConsiderPowerDown(
187 IN HANDLE hDeviceContext, 187 IN void *hDeviceContext,
188 IN BOOL bCheckRxDMA, 188 IN BOOL bCheckRxDMA,
189 IN BOOL bCheckCountToWakeUp 189 IN BOOL bCheckCountToWakeUp
190 ) 190 )
@@ -252,7 +252,7 @@ PSbConsiderPowerDown(
252 252
253void 253void
254PSvSendPSPOLL( 254PSvSendPSPOLL(
255 IN HANDLE hDeviceContext 255 IN 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 HANDLE hDeviceContext 301 IN 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 HANDLE hDeviceContext 387 IN void *hDeviceContext
388 ) 388 )
389{ 389{
390 390
diff --git a/drivers/staging/vt6655/power.h b/drivers/staging/vt6655/power.h
index bac8b200d54..769e0d1acd2 100644
--- a/drivers/staging/vt6655/power.h
+++ b/drivers/staging/vt6655/power.h
@@ -50,35 +50,35 @@
50 50
51BOOL 51BOOL
52PSbConsiderPowerDown( 52PSbConsiderPowerDown(
53 IN HANDLE hDeviceContext, 53 IN void *hDeviceContext,
54 IN BOOL bCheckRxDMA, 54 IN BOOL bCheckRxDMA,
55 IN BOOL bCheckCountToWakeUp 55 IN BOOL bCheckCountToWakeUp
56 ); 56 );
57 57
58void 58void
59PSvDisablePowerSaving( 59PSvDisablePowerSaving(
60 IN HANDLE hDeviceContext 60 IN void *hDeviceContext
61 ); 61 );
62 62
63void 63void
64PSvEnablePowerSaving( 64PSvEnablePowerSaving(
65 IN HANDLE hDeviceContext, 65 IN void *hDeviceContext,
66 IN WORD wListenInterval 66 IN WORD wListenInterval
67 ); 67 );
68 68
69void 69void
70PSvSendPSPOLL( 70PSvSendPSPOLL(
71 IN HANDLE hDeviceContext 71 IN void *hDeviceContext
72 ); 72 );
73 73
74BOOL 74BOOL
75PSbSendNullPacket( 75PSbSendNullPacket(
76 IN HANDLE hDeviceContext 76 IN void *hDeviceContext
77 ); 77 );
78 78
79BOOL 79BOOL
80PSbIsNextTBTTWakeUp( 80PSbIsNextTBTTWakeUp(
81 IN HANDLE hDeviceContext 81 IN void *hDeviceContext
82 ); 82 );
83 83
84#endif //__POWER_H__ 84#endif //__POWER_H__
diff --git a/drivers/staging/vt6655/ttype.h b/drivers/staging/vt6655/ttype.h
index b71fe591005..b2dff3a7b77 100644
--- a/drivers/staging/vt6655/ttype.h
+++ b/drivers/staging/vt6655/ttype.h
@@ -132,6 +132,4 @@ typedef DWORD * PDWORD;
132 132
133typedef QWORD * PQWORD; 133typedef QWORD * PQWORD;
134 134
135typedef void *HANDLE;
136
137#endif // __TTYPE_H__ 135#endif // __TTYPE_H__
diff --git a/drivers/staging/vt6655/wcmd.c b/drivers/staging/vt6655/wcmd.c
index ec1036e983d..6e460409f98 100644
--- a/drivers/staging/vt6655/wcmd.c
+++ b/drivers/staging/vt6655/wcmd.c
@@ -319,7 +319,7 @@ s_MgrMakeProbeRequest(
319 319
320void 320void
321vCommandTimerWait( 321vCommandTimerWait(
322 IN HANDLE hDeviceContext, 322 IN void *hDeviceContext,
323 IN UINT MSecond 323 IN UINT MSecond
324 ) 324 )
325{ 325{
@@ -339,7 +339,7 @@ vCommandTimerWait(
339 339
340void 340void
341vCommandTimer ( 341vCommandTimer (
342 IN HANDLE hDeviceContext 342 IN void *hDeviceContext
343 ) 343 )
344{ 344{
345 PSDevice pDevice = (PSDevice)hDeviceContext; 345 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -382,7 +382,7 @@ vCommandTimer (
382 // wait all Data TD complete 382 // wait all Data TD complete
383 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){ 383 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){
384 spin_unlock_irq(&pDevice->lock); 384 spin_unlock_irq(&pDevice->lock);
385 vCommandTimerWait((HANDLE)pDevice, 10); 385 vCommandTimerWait((void *)pDevice, 10);
386 return; 386 return;
387 }; 387 };
388 388
@@ -424,7 +424,7 @@ vCommandTimer (
424 pMgmt->abyScanBSSID[5] = 0xFF; 424 pMgmt->abyScanBSSID[5] = 0xFF;
425 pItemSSID->byElementID = WLAN_EID_SSID; 425 pItemSSID->byElementID = WLAN_EID_SSID;
426 // clear bssid list 426 // clear bssid list
427 // BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); 427 // BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
428 pMgmt->eScanState = WMAC_IS_SCANNING; 428 pMgmt->eScanState = WMAC_IS_SCANNING;
429 429
430 } 430 }
@@ -453,11 +453,11 @@ vCommandTimer (
453 (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) { 453 (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
454 s_vProbeChannel(pDevice); 454 s_vProbeChannel(pDevice);
455 spin_unlock_irq(&pDevice->lock); 455 spin_unlock_irq(&pDevice->lock);
456 vCommandTimerWait((HANDLE)pDevice, WCMD_ACTIVE_SCAN_TIME); 456 vCommandTimerWait((void *)pDevice, WCMD_ACTIVE_SCAN_TIME);
457 return; 457 return;
458 } else { 458 } else {
459 spin_unlock_irq(&pDevice->lock); 459 spin_unlock_irq(&pDevice->lock);
460 vCommandTimerWait((HANDLE)pDevice, WCMD_PASSIVE_SCAN_TIME); 460 vCommandTimerWait((void *)pDevice, WCMD_PASSIVE_SCAN_TIME);
461 return; 461 return;
462 } 462 }
463 463
@@ -501,7 +501,7 @@ vCommandTimer (
501 } else { 501 } else {
502 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n"); 502 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n");
503 // reason = 8 : disassoc because sta has left 503 // reason = 8 : disassoc because sta has left
504 vMgrDisassocBeginSta((HANDLE)pDevice, pMgmt, pMgmt->abyCurrBSSID, (8), &Status); 504 vMgrDisassocBeginSta((void *)pDevice, pMgmt, pMgmt->abyCurrBSSID, (8), &Status);
505 pDevice->bLinkPass = FALSE; 505 pDevice->bLinkPass = FALSE;
506 // unlock command busy 506 // unlock command busy
507 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; 507 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
@@ -515,7 +515,7 @@ vCommandTimer (
515 pDevice->eCommandState = WLAN_DISASSOCIATE_WAIT; 515 pDevice->eCommandState = WLAN_DISASSOCIATE_WAIT;
516 // wait all Control TD complete 516 // wait all Control TD complete
517 if (pDevice->iTDUsed[TYPE_TXDMA0] != 0){ 517 if (pDevice->iTDUsed[TYPE_TXDMA0] != 0){
518 vCommandTimerWait((HANDLE)pDevice, 10); 518 vCommandTimerWait((void *)pDevice, 10);
519 spin_unlock_irq(&pDevice->lock); 519 spin_unlock_irq(&pDevice->lock);
520 return; 520 return;
521 }; 521 };
@@ -528,7 +528,7 @@ vCommandTimer (
528 case WLAN_DISASSOCIATE_WAIT : 528 case WLAN_DISASSOCIATE_WAIT :
529 // wait all Control TD complete 529 // wait all Control TD complete
530 if (pDevice->iTDUsed[TYPE_TXDMA0] != 0){ 530 if (pDevice->iTDUsed[TYPE_TXDMA0] != 0){
531 vCommandTimerWait((HANDLE)pDevice, 10); 531 vCommandTimerWait((void *)pDevice, 10);
532 spin_unlock_irq(&pDevice->lock); 532 spin_unlock_irq(&pDevice->lock);
533 return; 533 return;
534 }; 534 };
@@ -578,24 +578,24 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
578 // set initial state 578 // set initial state
579 pMgmt->eCurrState = WMAC_STATE_IDLE; 579 pMgmt->eCurrState = WMAC_STATE_IDLE;
580 pMgmt->eCurrMode = WMAC_MODE_STANDBY; 580 pMgmt->eCurrMode = WMAC_MODE_STANDBY;
581 PSvDisablePowerSaving((HANDLE)pDevice); 581 PSvDisablePowerSaving((void *)pDevice);
582 BSSvClearNodeDBTable(pDevice, 0); 582 BSSvClearNodeDBTable(pDevice, 0);
583 583
584 vMgrJoinBSSBegin((HANDLE)pDevice, &Status); 584 vMgrJoinBSSBegin((void *)pDevice, &Status);
585 // if Infra mode 585 // if Infra mode
586 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { 586 if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
587 587
588 // Call mgr to begin the deauthentication 588 // Call mgr to begin the deauthentication
589 // reason = (3) beacuse sta has left ESS 589 // reason = (3) beacuse sta has left ESS
590 if (pMgmt->eCurrState>= WMAC_STATE_AUTH) { 590 if (pMgmt->eCurrState>= WMAC_STATE_AUTH) {
591 vMgrDeAuthenBeginSta((HANDLE)pDevice, pMgmt, pMgmt->abyCurrBSSID, (3), &Status); 591 vMgrDeAuthenBeginSta((void *)pDevice, pMgmt, pMgmt->abyCurrBSSID, (3), &Status);
592 } 592 }
593 // Call mgr to begin the authentication 593 // Call mgr to begin the authentication
594 vMgrAuthenBeginSta((HANDLE)pDevice, pMgmt, &Status); 594 vMgrAuthenBeginSta((void *)pDevice, pMgmt, &Status);
595 if (Status == CMD_STATUS_SUCCESS) { 595 if (Status == CMD_STATUS_SUCCESS) {
596 pDevice->byLinkWaitCount = 0; 596 pDevice->byLinkWaitCount = 0;
597 pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT; 597 pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT;
598 vCommandTimerWait((HANDLE)pDevice, AUTHENTICATE_TIMEOUT); 598 vCommandTimerWait((void *)pDevice, AUTHENTICATE_TIMEOUT);
599 spin_unlock_irq(&pDevice->lock); 599 spin_unlock_irq(&pDevice->lock);
600 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n"); 600 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n");
601 return; 601 return;
@@ -615,7 +615,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
615 } 615 }
616 else { 616 else {
617 // start own IBSS 617 // start own IBSS
618 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status); 618 vMgrCreateOwnIBSS((void *)pDevice, &Status);
619 if (Status != CMD_STATUS_SUCCESS){ 619 if (Status != CMD_STATUS_SUCCESS){
620 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " WLAN_CMD_IBSS_CREATE fail ! \n"); 620 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " WLAN_CMD_IBSS_CREATE fail ! \n");
621 }; 621 };
@@ -627,7 +627,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
627 if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA || 627 if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA ||
628 pMgmt->eConfigMode == WMAC_CONFIG_AUTO) { 628 pMgmt->eConfigMode == WMAC_CONFIG_AUTO) {
629 // start own IBSS 629 // start own IBSS
630 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status); 630 vMgrCreateOwnIBSS((void *)pDevice, &Status);
631 if (Status != CMD_STATUS_SUCCESS){ 631 if (Status != CMD_STATUS_SUCCESS){
632 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_IBSS_CREATE fail ! \n"); 632 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_IBSS_CREATE fail ! \n");
633 }; 633 };
@@ -661,12 +661,12 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
661 // Call mgr to begin the association 661 // Call mgr to begin the association
662 pDevice->byLinkWaitCount = 0; 662 pDevice->byLinkWaitCount = 0;
663 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_AUTH\n"); 663 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_AUTH\n");
664 vMgrAssocBeginSta((HANDLE)pDevice, pMgmt, &Status); 664 vMgrAssocBeginSta((void *)pDevice, pMgmt, &Status);
665 if (Status == CMD_STATUS_SUCCESS) { 665 if (Status == CMD_STATUS_SUCCESS) {
666 pDevice->byLinkWaitCount = 0; 666 pDevice->byLinkWaitCount = 0;
667 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState = WLAN_ASSOCIATE_WAIT\n"); 667 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState = WLAN_ASSOCIATE_WAIT\n");
668 pDevice->eCommandState = WLAN_ASSOCIATE_WAIT; 668 pDevice->eCommandState = WLAN_ASSOCIATE_WAIT;
669 vCommandTimerWait((HANDLE)pDevice, ASSOCIATE_TIMEOUT); 669 vCommandTimerWait((void *)pDevice, ASSOCIATE_TIMEOUT);
670 spin_unlock_irq(&pDevice->lock); 670 spin_unlock_irq(&pDevice->lock);
671 return; 671 return;
672 } 672 }
@@ -679,7 +679,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
679 pDevice->byLinkWaitCount ++; 679 pDevice->byLinkWaitCount ++;
680 printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n",pDevice->byLinkWaitCount); 680 printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n",pDevice->byLinkWaitCount);
681 spin_unlock_irq(&pDevice->lock); 681 spin_unlock_irq(&pDevice->lock);
682 vCommandTimerWait((HANDLE)pDevice, AUTHENTICATE_TIMEOUT/2); 682 vCommandTimerWait((void *)pDevice, AUTHENTICATE_TIMEOUT/2);
683 return; 683 return;
684 } 684 }
685 pDevice->byLinkWaitCount = 0; 685 pDevice->byLinkWaitCount = 0;
@@ -702,7 +702,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
702 if (pMgmt->eCurrState == WMAC_STATE_ASSOC) { 702 if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
703 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_ASSOC\n"); 703 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_ASSOC\n");
704 if (pDevice->ePSMode != WMAC_POWER_CAM) { 704 if (pDevice->ePSMode != WMAC_POWER_CAM) {
705 PSvEnablePowerSaving((HANDLE)pDevice, pMgmt->wListenInterval); 705 PSvEnablePowerSaving((void *)pDevice, pMgmt->wListenInterval);
706 } 706 }
707 if (pMgmt->eAuthenMode >= WMAC_AUTH_WPA) { 707 if (pMgmt->eAuthenMode >= WMAC_AUTH_WPA) {
708 KeybRemoveAllKey(&(pDevice->sKey), pDevice->abyBSSID, pDevice->PortOffset); 708 KeybRemoveAllKey(&(pDevice->sKey), pDevice->abyBSSID, pDevice->PortOffset);
@@ -743,7 +743,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
743 pDevice->byLinkWaitCount ++; 743 pDevice->byLinkWaitCount ++;
744 printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n",pDevice->byLinkWaitCount); 744 printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n",pDevice->byLinkWaitCount);
745 spin_unlock_irq(&pDevice->lock); 745 spin_unlock_irq(&pDevice->lock);
746 vCommandTimerWait((HANDLE)pDevice, ASSOCIATE_TIMEOUT/2); 746 vCommandTimerWait((void *)pDevice, ASSOCIATE_TIMEOUT/2);
747 return; 747 return;
748 } 748 }
749 pDevice->byLinkWaitCount = 0; 749 pDevice->byLinkWaitCount = 0;
@@ -779,7 +779,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
779 pMgmt->eCurrState = WMAC_STATE_IDLE; 779 pMgmt->eCurrState = WMAC_STATE_IDLE;
780 pDevice->bFixRate = FALSE; 780 pDevice->bFixRate = FALSE;
781 781
782 vMgrCreateOwnIBSS((HANDLE)pDevice, &Status); 782 vMgrCreateOwnIBSS((void *)pDevice, &Status);
783 if (Status != CMD_STATUS_SUCCESS){ 783 if (Status != CMD_STATUS_SUCCESS){
784 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " vMgrCreateOwnIBSS fail ! \n"); 784 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " vMgrCreateOwnIBSS fail ! \n");
785 }; 785 };
@@ -869,12 +869,12 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS
869 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_CHECK_BBSENSITIVITY_START\n"); 869 //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_CHECK_BBSENSITIVITY_START\n");
870 // wait all TD complete 870 // wait all TD complete
871 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){ 871 if (pDevice->iTDUsed[TYPE_AC0DMA] != 0){
872 vCommandTimerWait((HANDLE)pDevice, 10); 872 vCommandTimerWait((void *)pDevice, 10);
873 spin_unlock_irq(&pDevice->lock); 873 spin_unlock_irq(&pDevice->lock);
874 return; 874 return;
875 } 875 }
876 if (pDevice->iTDUsed[TYPE_TXDMA0] != 0){ 876 if (pDevice->iTDUsed[TYPE_TXDMA0] != 0){
877 vCommandTimerWait((HANDLE)pDevice, 10); 877 vCommandTimerWait((void *)pDevice, 10);
878 spin_unlock_irq(&pDevice->lock); 878 spin_unlock_irq(&pDevice->lock);
879 return; 879 return;
880 } 880 }
@@ -971,7 +971,7 @@ s_bCommandComplete (
971 971
972 } 972 }
973 973
974 vCommandTimerWait((HANDLE)pDevice, 0); 974 vCommandTimerWait((void *)pDevice, 0);
975 } 975 }
976 976
977 return TRUE; 977 return TRUE;
@@ -980,7 +980,7 @@ s_bCommandComplete (
980 980
981 981
982BOOL bScheduleCommand ( 982BOOL bScheduleCommand (
983 IN HANDLE hDeviceContext, 983 IN void *hDeviceContext,
984 IN CMD_CODE eCommand, 984 IN CMD_CODE eCommand,
985 IN PBYTE pbyItem0 985 IN PBYTE pbyItem0
986 ) 986 )
@@ -1061,7 +1061,7 @@ BOOL bScheduleCommand (
1061 * 1061 *
1062 */ 1062 */
1063BOOL bClearBSSID_SCAN ( 1063BOOL bClearBSSID_SCAN (
1064 IN HANDLE hDeviceContext 1064 IN 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 HANDLE hDeviceContext 1086 IN 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 HANDLE hDeviceContext 1110 IN 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 1e816696201..67b08f61edc 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 HANDLE hDeviceContext 114 IN void *hDeviceContext
115 ); 115 );
116 116
117void 117void
118vCommandTimer ( 118vCommandTimer (
119 IN HANDLE hDeviceContext 119 IN void *hDeviceContext
120 ); 120 );
121 121
122BOOL bClearBSSID_SCAN( 122BOOL bClearBSSID_SCAN(
123 IN HANDLE hDeviceContext 123 IN void *hDeviceContext
124 ); 124 );
125 125
126BOOL 126BOOL
127bScheduleCommand( 127bScheduleCommand(
128 IN HANDLE hDeviceContext, 128 IN void *hDeviceContext,
129 IN CMD_CODE eCommand, 129 IN CMD_CODE eCommand,
130 IN PBYTE pbyItem0 130 IN PBYTE pbyItem0
131 ); 131 );
132 132
133void 133void
134vCommandTimerWait( 134vCommandTimerWait(
135 IN HANDLE hDeviceContext, 135 IN void *hDeviceContext,
136 IN UINT MSecond 136 IN UINT MSecond
137 ); 137 );
138#ifdef TxInSleep 138#ifdef TxInSleep
139void 139void
140BSSvSecondTxData( 140BSSvSecondTxData(
141 IN HANDLE hDeviceContext 141 IN 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 ed5342ba261..614850a7b91 100644
--- a/drivers/staging/vt6655/wmgr.c
+++ b/drivers/staging/vt6655/wmgr.c
@@ -349,7 +349,7 @@ s_bCipherMatch (
349 349
350void 350void
351vMgrObjectInit( 351vMgrObjectInit(
352 IN HANDLE hDeviceContext 352 IN void *hDeviceContext
353 ) 353 )
354{ 354{
355 PSDevice pDevice = (PSDevice)hDeviceContext; 355 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -368,7 +368,7 @@ vMgrObjectInit(
368 pMgmt->byCSSPK = KEY_CTL_NONE; 368 pMgmt->byCSSPK = KEY_CTL_NONE;
369 pMgmt->byCSSGK = KEY_CTL_NONE; 369 pMgmt->byCSSGK = KEY_CTL_NONE;
370 pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI; 370 pMgmt->wIBSSBeaconPeriod = DEFAULT_IBSS_BI;
371 BSSvClearBSSList((HANDLE)pDevice, FALSE); 371 BSSvClearBSSList((void *)pDevice, FALSE);
372 372
373 return; 373 return;
374} 374}
@@ -385,7 +385,7 @@ vMgrObjectInit(
385 385
386void 386void
387vMgrTimerInit( 387vMgrTimerInit(
388 IN HANDLE hDeviceContext 388 IN 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 HANDLE hDeviceContext 436 IN void *hDeviceContext
437 ) 437 )
438{ 438{
439 PSDevice pDevice = (PSDevice)hDeviceContext; 439 PSDevice pDevice = (PSDevice)hDeviceContext;
@@ -462,7 +462,7 @@ vMgrObjectReset(
462 462
463void 463void
464vMgrAssocBeginSta( 464vMgrAssocBeginSta(
465 IN HANDLE hDeviceContext, 465 IN void *hDeviceContext,
466 IN PSMgmtObject pMgmt, 466 IN PSMgmtObject pMgmt,
467 OUT PCMD_STATUS pStatus 467 OUT PCMD_STATUS pStatus
468 ) 468 )
@@ -538,7 +538,7 @@ vMgrAssocBeginSta(
538 538
539void 539void
540vMgrReAssocBeginSta( 540vMgrReAssocBeginSta(
541 IN HANDLE hDeviceContext, 541 IN void *hDeviceContext,
542 IN PSMgmtObject pMgmt, 542 IN PSMgmtObject pMgmt,
543 OUT PCMD_STATUS pStatus 543 OUT PCMD_STATUS pStatus
544 ) 544 )
@@ -617,7 +617,7 @@ vMgrReAssocBeginSta(
617 617
618void 618void
619vMgrDisassocBeginSta( 619vMgrDisassocBeginSta(
620 IN HANDLE hDeviceContext, 620 IN void *hDeviceContext,
621 IN PSMgmtObject pMgmt, 621 IN PSMgmtObject pMgmt,
622 IN PBYTE abyDestAddress, 622 IN PBYTE abyDestAddress,
623 IN WORD wReason, 623 IN WORD wReason,
@@ -1041,7 +1041,7 @@ s_vMgrRxAssocResponse(
1041 }; 1041 };
1042 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Association Successful, AID=%d.\n", pMgmt->wCurrAID & ~(BIT14|BIT15)); 1042 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Association Successful, AID=%d.\n", pMgmt->wCurrAID & ~(BIT14|BIT15));
1043 pMgmt->eCurrState = WMAC_STATE_ASSOC; 1043 pMgmt->eCurrState = WMAC_STATE_ASSOC;
1044 BSSvUpdateAPNode((HANDLE)pDevice, sFrame.pwCapInfo, sFrame.pSuppRates, sFrame.pExtSuppRates); 1044 BSSvUpdateAPNode((void *)pDevice, sFrame.pwCapInfo, sFrame.pSuppRates, sFrame.pExtSuppRates);
1045 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; 1045 pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
1046 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Link with AP(SSID): %s\n", pItemSSID->abySSID); 1046 DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Link with AP(SSID): %s\n", pItemSSID->abySSID);
1047 pDevice->bLinkPass = TRUE; 1047 pDevice->bLinkPass = TRUE;
@@ -1152,7 +1152,7 @@ if(pMgmt->eCurrState == WMAC_STATE_ASSOC)
1152 1152
1153void 1153void
1154vMgrAuthenBeginSta( 1154vMgrAuthenBeginSta(
1155 IN HANDLE hDeviceContext, 1155 IN void *hDeviceContext,
1156 IN PSMgmtObject pMgmt, 1156 IN PSMgmtObject pMgmt,
1157 OUT PCMD_STATUS pStatus 1157 OUT PCMD_STATUS pStatus
1158 ) 1158 )
@@ -1210,7 +1210,7 @@ vMgrAuthenBeginSta(
1210 1210
1211void 1211void
1212vMgrDeAuthenBeginSta( 1212vMgrDeAuthenBeginSta(
1213 IN HANDLE hDeviceContext, 1213 IN void *hDeviceContext,
1214 IN PSMgmtObject pMgmt, 1214 IN PSMgmtObject pMgmt,
1215 IN PBYTE abyDestAddress, 1215 IN PBYTE abyDestAddress,
1216 IN WORD wReason, 1216 IN WORD wReason,
@@ -1455,7 +1455,7 @@ s_vMgrRxAuthenSequence_2(
1455 } 1455 }
1456 if (pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) { 1456 if (pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) {
1457// spin_unlock_irq(&pDevice->lock); 1457// spin_unlock_irq(&pDevice->lock);
1458// vCommandTimerWait((HANDLE)pDevice, 0); 1458// vCommandTimerWait((void *)pDevice, 0);
1459// spin_lock_irq(&pDevice->lock); 1459// spin_lock_irq(&pDevice->lock);
1460 } 1460 }
1461 1461
@@ -1502,7 +1502,7 @@ s_vMgrRxAuthenSequence_2(
1502 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:rx Auth_reply sequence_2 status error ...\n"); 1502 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Mgt:rx Auth_reply sequence_2 status error ...\n");
1503 if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) { 1503 if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) {
1504// spin_unlock_irq(&pDevice->lock); 1504// spin_unlock_irq(&pDevice->lock);
1505// vCommandTimerWait((HANDLE)pDevice, 0); 1505// vCommandTimerWait((void *)pDevice, 0);
1506// spin_lock_irq(&pDevice->lock); 1506// spin_lock_irq(&pDevice->lock);
1507 } 1507 }
1508 s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus)))); 1508 s_vMgrLogStatus(pMgmt, cpu_to_le16((*(pFrame->pwStatus))));
@@ -1640,7 +1640,7 @@ s_vMgrRxAuthenSequence_4(
1640 1640
1641 if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) { 1641 if ( pDevice->eCommandState == WLAN_AUTHENTICATE_WAIT ) {
1642// spin_unlock_irq(&pDevice->lock); 1642// spin_unlock_irq(&pDevice->lock);
1643// vCommandTimerWait((HANDLE)pDevice, 0); 1643// vCommandTimerWait((void *)pDevice, 0);
1644// spin_lock_irq(&pDevice->lock); 1644// spin_lock_irq(&pDevice->lock);
1645 } 1645 }
1646 1646
@@ -1943,10 +1943,10 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
1943 sERP.byERP = 0; 1943 sERP.byERP = 0;
1944 } 1944 }
1945 1945
1946 pBSSList = BSSpAddrIsInBSSList((HANDLE)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID); 1946 pBSSList = BSSpAddrIsInBSSList((void *)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID);
1947 if (pBSSList == NULL) { 1947 if (pBSSList == NULL) {
1948 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon/insert: RxChannel = : %d\n", byCurrChannel); 1948 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Beacon/insert: RxChannel = : %d\n", byCurrChannel);
1949 BSSbInsertToBSSList((HANDLE)pDevice, 1949 BSSbInsertToBSSList((void *)pDevice,
1950 sFrame.pHdr->sA3.abyAddr3, 1950 sFrame.pHdr->sA3.abyAddr3,
1951 *sFrame.pqwTimestamp, 1951 *sFrame.pqwTimestamp,
1952 *sFrame.pwBeaconInterval, 1952 *sFrame.pwBeaconInterval,
@@ -1962,12 +1962,12 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
1962 sFrame.pIE_Quiet, 1962 sFrame.pIE_Quiet,
1963 sFrame.len - WLAN_HDR_ADDR3_LEN, 1963 sFrame.len - WLAN_HDR_ADDR3_LEN,
1964 sFrame.pHdr->sA4.abyAddr4, // payload of beacon 1964 sFrame.pHdr->sA4.abyAddr4, // payload of beacon
1965 (HANDLE)pRxPacket 1965 (void *)pRxPacket
1966 ); 1966 );
1967 } 1967 }
1968 else { 1968 else {
1969// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"update bcn: RxChannel = : %d\n", byCurrChannel); 1969// DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"update bcn: RxChannel = : %d\n", byCurrChannel);
1970 BSSbUpdateToBSSList((HANDLE)pDevice, 1970 BSSbUpdateToBSSList((void *)pDevice,
1971 *sFrame.pqwTimestamp, 1971 *sFrame.pqwTimestamp,
1972 *sFrame.pwBeaconInterval, 1972 *sFrame.pwBeaconInterval,
1973 *sFrame.pwCapInfo, 1973 *sFrame.pwCapInfo,
@@ -1984,7 +1984,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
1984 pBSSList, 1984 pBSSList,
1985 sFrame.len - WLAN_HDR_ADDR3_LEN, 1985 sFrame.len - WLAN_HDR_ADDR3_LEN,
1986 sFrame.pHdr->sA4.abyAddr4, // payload of probresponse 1986 sFrame.pHdr->sA4.abyAddr4, // payload of probresponse
1987 (HANDLE)pRxPacket 1987 (void *)pRxPacket
1988 ); 1988 );
1989 1989
1990 } 1990 }
@@ -2353,7 +2353,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2353 // set highest basic rate 2353 // set highest basic rate
2354 // s_vSetHighestBasicRate(pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates); 2354 // s_vSetHighestBasicRate(pDevice, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates);
2355 // Prepare beacon frame 2355 // Prepare beacon frame
2356 bMgrPrepareBeaconToSend((HANDLE)pDevice, pMgmt); 2356 bMgrPrepareBeaconToSend((void *)pDevice, pMgmt);
2357 // } 2357 // }
2358 }; 2358 };
2359 } 2359 }
@@ -2386,7 +2386,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
2386-*/ 2386-*/
2387void 2387void
2388vMgrCreateOwnIBSS( 2388vMgrCreateOwnIBSS(
2389 IN HANDLE hDeviceContext, 2389 IN void *hDeviceContext,
2390 OUT PCMD_STATUS pStatus 2390 OUT PCMD_STATUS pStatus
2391 ) 2391 )
2392{ 2392{
@@ -2629,7 +2629,7 @@ vMgrCreateOwnIBSS(
2629 2629
2630 pMgmt->eCurrState = WMAC_STATE_STARTED; 2630 pMgmt->eCurrState = WMAC_STATE_STARTED;
2631 // Prepare beacon to send 2631 // Prepare beacon to send
2632 if (bMgrPrepareBeaconToSend((HANDLE)pDevice, pMgmt)) { 2632 if (bMgrPrepareBeaconToSend((void *)pDevice, pMgmt)) {
2633 *pStatus = CMD_STATUS_SUCCESS; 2633 *pStatus = CMD_STATUS_SUCCESS;
2634 } 2634 }
2635 2635
@@ -2653,7 +2653,7 @@ vMgrCreateOwnIBSS(
2653 2653
2654void 2654void
2655vMgrJoinBSSBegin( 2655vMgrJoinBSSBegin(
2656 IN HANDLE hDeviceContext, 2656 IN void *hDeviceContext,
2657 OUT PCMD_STATUS pStatus 2657 OUT PCMD_STATUS pStatus
2658 ) 2658 )
2659{ 2659{
@@ -2802,12 +2802,12 @@ vMgrJoinBSSBegin(
2802 // Add current BSS to Candidate list 2802 // Add current BSS to Candidate list
2803 // This should only works for WPA2 BSS, and WPA2 BSS check must be done before. 2803 // This should only works for WPA2 BSS, and WPA2 BSS check must be done before.
2804 if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) { 2804 if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) {
2805 BOOL bResult = bAdd_PMKID_Candidate((HANDLE)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); 2805 BOOL bResult = bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
2806 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult); 2806 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"bAdd_PMKID_Candidate: 1(%d)\n", bResult);
2807 if (bResult == FALSE) { 2807 if (bResult == FALSE) {
2808 vFlush_PMKID_Candidate((HANDLE)pDevice); 2808 vFlush_PMKID_Candidate((void *)pDevice);
2809 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 4\n"); 2809 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 4\n");
2810 bAdd_PMKID_Candidate((HANDLE)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj); 2810 bAdd_PMKID_Candidate((void *)pDevice, pMgmt->abyCurrBSSID, &pCurr->sRSNCapObj);
2811 } 2811 }
2812 } 2812 }
2813 2813
@@ -2898,7 +2898,7 @@ vMgrJoinBSSBegin(
2898 // and if registry setting is short preamble we can turn on too. 2898 // and if registry setting is short preamble we can turn on too.
2899 2899
2900 // Prepare beacon 2900 // Prepare beacon
2901 bMgrPrepareBeaconToSend((HANDLE)pDevice, pMgmt); 2901 bMgrPrepareBeaconToSend((void *)pDevice, pMgmt);
2902 } 2902 }
2903 else { 2903 else {
2904 pMgmt->eCurrState = WMAC_STATE_IDLE; 2904 pMgmt->eCurrState = WMAC_STATE_IDLE;
@@ -4378,9 +4378,9 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
4378 4378
4379 4379
4380 // update or insert the bss 4380 // update or insert the bss
4381 pBSSList = BSSpAddrIsInBSSList((HANDLE)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID); 4381 pBSSList = BSSpAddrIsInBSSList((void *)pDevice, sFrame.pHdr->sA3.abyAddr3, sFrame.pSSID);
4382 if (pBSSList) { 4382 if (pBSSList) {
4383 BSSbUpdateToBSSList((HANDLE)pDevice, 4383 BSSbUpdateToBSSList((void *)pDevice,
4384 *sFrame.pqwTimestamp, 4384 *sFrame.pqwTimestamp,
4385 *sFrame.pwBeaconInterval, 4385 *sFrame.pwBeaconInterval,
4386 *sFrame.pwCapInfo, 4386 *sFrame.pwCapInfo,
@@ -4397,12 +4397,12 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
4397 pBSSList, 4397 pBSSList,
4398 sFrame.len - WLAN_HDR_ADDR3_LEN, 4398 sFrame.len - WLAN_HDR_ADDR3_LEN,
4399 sFrame.pHdr->sA4.abyAddr4, // payload of probresponse 4399 sFrame.pHdr->sA4.abyAddr4, // payload of probresponse
4400 (HANDLE)pRxPacket 4400 (void *)pRxPacket
4401 ); 4401 );
4402 } 4402 }
4403 else { 4403 else {
4404 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Probe resp/insert: RxChannel = : %d\n", byCurrChannel); 4404 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Probe resp/insert: RxChannel = : %d\n", byCurrChannel);
4405 BSSbInsertToBSSList((HANDLE)pDevice, 4405 BSSbInsertToBSSList((void *)pDevice,
4406 sFrame.pHdr->sA3.abyAddr3, 4406 sFrame.pHdr->sA3.abyAddr3,
4407 *sFrame.pqwTimestamp, 4407 *sFrame.pqwTimestamp,
4408 *sFrame.pwBeaconInterval, 4408 *sFrame.pwBeaconInterval,
@@ -4418,7 +4418,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
4418 sFrame.pIE_Quiet, 4418 sFrame.pIE_Quiet,
4419 sFrame.len - WLAN_HDR_ADDR3_LEN, 4419 sFrame.len - WLAN_HDR_ADDR3_LEN,
4420 sFrame.pHdr->sA4.abyAddr4, // payload of beacon 4420 sFrame.pHdr->sA4.abyAddr4, // payload of beacon
4421 (HANDLE)pRxPacket 4421 (void *)pRxPacket
4422 ); 4422 );
4423 } 4423 }
4424 return; 4424 return;
@@ -4536,7 +4536,7 @@ s_vMgrRxProbeRequest(
4536 4536
4537void 4537void
4538vMgrRxManagePacket( 4538vMgrRxManagePacket(
4539 IN HANDLE hDeviceContext, 4539 IN void *hDeviceContext,
4540 IN PSMgmtObject pMgmt, 4540 IN PSMgmtObject pMgmt,
4541 IN PSRxMgmtPacket pRxPacket 4541 IN PSRxMgmtPacket pRxPacket
4542 ) 4542 )
@@ -4685,7 +4685,7 @@ vMgrRxManagePacket(
4685-*/ 4685-*/
4686BOOL 4686BOOL
4687bMgrPrepareBeaconToSend( 4687bMgrPrepareBeaconToSend(
4688 IN HANDLE hDeviceContext, 4688 IN void *hDeviceContext,
4689 IN PSMgmtObject pMgmt 4689 IN PSMgmtObject pMgmt
4690 ) 4690 )
4691{ 4691{
@@ -4809,7 +4809,7 @@ s_vMgrLogStatus(
4809-*/ 4809-*/
4810BOOL 4810BOOL
4811bAdd_PMKID_Candidate ( 4811bAdd_PMKID_Candidate (
4812 IN HANDLE hDeviceContext, 4812 IN void *hDeviceContext,
4813 IN PBYTE pbyBSSID, 4813 IN PBYTE pbyBSSID,
4814 IN PSRSNCapObject psRSNCapObj 4814 IN PSRSNCapObject psRSNCapObj
4815 ) 4815 )
@@ -4870,7 +4870,7 @@ bAdd_PMKID_Candidate (
4870-*/ 4870-*/
4871void 4871void
4872vFlush_PMKID_Candidate ( 4872vFlush_PMKID_Candidate (
4873 IN HANDLE hDeviceContext 4873 IN void *hDeviceContext
4874 ) 4874 )
4875{ 4875{
4876 PSDevice pDevice = (PSDevice)hDeviceContext; 4876 PSDevice pDevice = (PSDevice)hDeviceContext;
diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h
index 5eabc199c02..cee86028181 100644
--- a/drivers/staging/vt6655/wmgr.h
+++ b/drivers/staging/vt6655/wmgr.h
@@ -401,36 +401,36 @@ typedef struct tagSMgmtObject
401 401
402void 402void
403vMgrObjectInit( 403vMgrObjectInit(
404 IN HANDLE hDeviceContext 404 IN void *hDeviceContext
405 ); 405 );
406 406
407void 407void
408vMgrTimerInit( 408vMgrTimerInit(
409 IN HANDLE hDeviceContext 409 IN void *hDeviceContext
410 ); 410 );
411 411
412void 412void
413vMgrObjectReset( 413vMgrObjectReset(
414 IN HANDLE hDeviceContext 414 IN void *hDeviceContext
415 ); 415 );
416 416
417void 417void
418vMgrAssocBeginSta( 418vMgrAssocBeginSta(
419 IN HANDLE hDeviceContext, 419 IN void *hDeviceContext,
420 IN PSMgmtObject pMgmt, 420 IN PSMgmtObject pMgmt,
421 OUT PCMD_STATUS pStatus 421 OUT PCMD_STATUS pStatus
422 ); 422 );
423 423
424void 424void
425vMgrReAssocBeginSta( 425vMgrReAssocBeginSta(
426 IN HANDLE hDeviceContext, 426 IN void *hDeviceContext,
427 IN PSMgmtObject pMgmt, 427 IN PSMgmtObject pMgmt,
428 OUT PCMD_STATUS pStatus 428 OUT PCMD_STATUS pStatus
429 ); 429 );
430 430
431void 431void
432vMgrDisassocBeginSta( 432vMgrDisassocBeginSta(
433 IN HANDLE hDeviceContext, 433 IN void *hDeviceContext,
434 IN PSMgmtObject pMgmt, 434 IN PSMgmtObject pMgmt,
435 IN PBYTE abyDestAddress, 435 IN PBYTE abyDestAddress,
436 IN WORD wReason, 436 IN WORD wReason,
@@ -439,26 +439,26 @@ vMgrDisassocBeginSta(
439 439
440void 440void
441vMgrAuthenBeginSta( 441vMgrAuthenBeginSta(
442 IN HANDLE hDeviceContext, 442 IN void *hDeviceContext,
443 IN PSMgmtObject pMgmt, 443 IN PSMgmtObject pMgmt,
444 OUT PCMD_STATUS pStatus 444 OUT PCMD_STATUS pStatus
445 ); 445 );
446 446
447void 447void
448vMgrCreateOwnIBSS( 448vMgrCreateOwnIBSS(
449 IN HANDLE hDeviceContext, 449 IN void *hDeviceContext,
450 OUT PCMD_STATUS pStatus 450 OUT PCMD_STATUS pStatus
451 ); 451 );
452 452
453void 453void
454vMgrJoinBSSBegin( 454vMgrJoinBSSBegin(
455 IN HANDLE hDeviceContext, 455 IN void *hDeviceContext,
456 OUT PCMD_STATUS pStatus 456 OUT PCMD_STATUS pStatus
457 ); 457 );
458 458
459void 459void
460vMgrRxManagePacket( 460vMgrRxManagePacket(
461 IN HANDLE hDeviceContext, 461 IN void *hDeviceContext,
462 IN PSMgmtObject pMgmt, 462 IN PSMgmtObject pMgmt,
463 IN PSRxMgmtPacket pRxPacket 463 IN PSRxMgmtPacket pRxPacket
464 ); 464 );
@@ -466,14 +466,14 @@ vMgrRxManagePacket(
466/* 466/*
467void 467void
468vMgrScanBegin( 468vMgrScanBegin(
469 IN HANDLE hDeviceContext, 469 IN void *hDeviceContext,
470 OUT PCMD_STATUS pStatus 470 OUT PCMD_STATUS pStatus
471 ); 471 );
472*/ 472*/
473 473
474void 474void
475vMgrDeAuthenBeginSta( 475vMgrDeAuthenBeginSta(
476 IN HANDLE hDeviceContext, 476 IN void *hDeviceContext,
477 IN PSMgmtObject pMgmt, 477 IN PSMgmtObject pMgmt,
478 IN PBYTE abyDestAddress, 478 IN PBYTE abyDestAddress,
479 IN WORD wReason, 479 IN WORD wReason,
@@ -482,21 +482,21 @@ vMgrDeAuthenBeginSta(
482 482
483BOOL 483BOOL
484bMgrPrepareBeaconToSend( 484bMgrPrepareBeaconToSend(
485 IN HANDLE hDeviceContext, 485 IN void *hDeviceContext,
486 IN PSMgmtObject pMgmt 486 IN PSMgmtObject pMgmt
487 ); 487 );
488 488
489 489
490BOOL 490BOOL
491bAdd_PMKID_Candidate ( 491bAdd_PMKID_Candidate (
492 IN HANDLE hDeviceContext, 492 IN void *hDeviceContext,
493 IN PBYTE pbyBSSID, 493 IN PBYTE pbyBSSID,
494 IN PSRSNCapObject psRSNCapObj 494 IN PSRSNCapObject psRSNCapObj
495 ); 495 );
496 496
497void 497void
498vFlush_PMKID_Candidate ( 498vFlush_PMKID_Candidate (
499 IN HANDLE hDeviceContext 499 IN void *hDeviceContext
500 ); 500 );
501 501
502#endif // __WMGR_H__ 502#endif // __WMGR_H__
diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c
index 4e886c16209..e5e618eb6bb 100644
--- a/drivers/staging/vt6655/wpactl.c
+++ b/drivers/staging/vt6655/wpactl.c
@@ -496,7 +496,7 @@ static int wpa_set_disassociate(PSDevice pDevice,
496 spin_lock_irq(&pDevice->lock); 496 spin_lock_irq(&pDevice->lock);
497 if (pDevice->bLinkPass) { 497 if (pDevice->bLinkPass) {
498 if (!memcmp(param->addr, pMgmt->abyCurrBSSID, 6)) 498 if (!memcmp(param->addr, pMgmt->abyCurrBSSID, 6))
499 bScheduleCommand((HANDLE)pDevice, WLAN_CMD_DISASSOCIATE, NULL); 499 bScheduleCommand((void *)pDevice, WLAN_CMD_DISASSOCIATE, NULL);
500 } 500 }
501 spin_unlock_irq(&pDevice->lock); 501 spin_unlock_irq(&pDevice->lock);
502 502
@@ -525,8 +525,8 @@ static int wpa_set_scan(PSDevice pDevice,
525 int ret = 0; 525 int ret = 0;
526 526
527 spin_lock_irq(&pDevice->lock); 527 spin_lock_irq(&pDevice->lock);
528 BSSvClearBSSList((HANDLE)pDevice, pDevice->bLinkPass); 528 BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
529 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, NULL); 529 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
530 spin_unlock_irq(&pDevice->lock); 530 spin_unlock_irq(&pDevice->lock);
531 531
532 return ret; 532 return ret;
@@ -786,7 +786,7 @@ static int wpa_set_associate(PSDevice pDevice,
786 memcpy(pMgmt->abyDesireBSSID, param->u.wpa_associate.bssid, 6); 786 memcpy(pMgmt->abyDesireBSSID, param->u.wpa_associate.bssid, 6);
787else 787else
788{ 788{
789 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pItemSSID->abySSID); 789 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pItemSSID->abySSID);
790} 790}
791 791
792 if (param->u.wpa_associate.wpa_ie_len == 0) { 792 if (param->u.wpa_associate.wpa_ie_len == 0) {
@@ -870,11 +870,11 @@ if (!((pMgmt->eAuthenMode == WMAC_AUTH_SHAREKEY) ||
870 870
871 if (pCurr == NULL){ 871 if (pCurr == NULL){
872 printk("wpa_set_associate---->hidden mode site survey before associate.......\n"); 872 printk("wpa_set_associate---->hidden mode site survey before associate.......\n");
873 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); 873 bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
874 }; 874 };
875} 875}
876/****************************************************************/ 876/****************************************************************/
877 bScheduleCommand((HANDLE) pDevice, WLAN_CMD_SSID, NULL); 877 bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
878 spin_unlock_irq(&pDevice->lock); 878 spin_unlock_irq(&pDevice->lock);
879 879
880 return ret; 880 return ret;
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 18:33:24 -0400