diff options
Diffstat (limited to 'drivers/staging/vt6655/vntwifi.c')
| -rw-r--r-- | drivers/staging/vt6655/vntwifi.c | 104 |
1 files changed, 50 insertions, 54 deletions
diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c index b527a019188b..4783d34cef6d 100644 --- a/drivers/staging/vt6655/vntwifi.c +++ b/drivers/staging/vt6655/vntwifi.c @@ -101,9 +101,9 @@ VNTWIFIvSetOPMode ( void VNTWIFIvSetIBSSParameter ( void *pMgmtHandle, - WORD wBeaconPeriod, - WORD wATIMWindow, - UINT uChannel + unsigned short wBeaconPeriod, + unsigned short wATIMWindow, + unsigned int uChannel ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; @@ -150,7 +150,7 @@ VNTWIFIpGetCurrentSSID ( * Return Value: current Channel. * -*/ -UINT +unsigned int VNTWIFIpGetCurrentChannel ( void *pMgmtHandle ) @@ -176,7 +176,7 @@ VNTWIFIpGetCurrentChannel ( * Return Value: current Assoc ID * -*/ -WORD +unsigned short VNTWIFIwGetAssocID ( void *pMgmtHandle ) @@ -202,15 +202,15 @@ VNTWIFIwGetAssocID ( * Return Value: max support rate * -*/ -BYTE +unsigned char VNTWIFIbyGetMaxSupportRate ( PWLAN_IE_SUPP_RATES pSupportRateIEs, PWLAN_IE_SUPP_RATES pExtSupportRateIEs ) { - BYTE byMaxSupportRate = RATE_1M; - BYTE bySupportRate = RATE_1M; - UINT ii = 0; + unsigned char byMaxSupportRate = RATE_1M; + unsigned char bySupportRate = RATE_1M; + unsigned int ii = 0; if (pSupportRateIEs) { for (ii = 0; ii < pSupportRateIEs->len; ii++) { @@ -248,16 +248,16 @@ VNTWIFIbyGetMaxSupportRate ( * Return Value: max support rate * -*/ -BYTE +unsigned char VNTWIFIbyGetACKTxRate ( - BYTE byRxDataRate, + unsigned char byRxDataRate, PWLAN_IE_SUPP_RATES pSupportRateIEs, PWLAN_IE_SUPP_RATES pExtSupportRateIEs ) { - BYTE byMaxAckRate; - BYTE byBasicRate; - UINT ii; + unsigned char byMaxAckRate; + unsigned char byBasicRate; + unsigned int ii; if (byRxDataRate <= RATE_11M) { byMaxAckRate = RATE_1M; @@ -425,16 +425,12 @@ VNTWIFIbGetConfigPhyMode ( -*/ void -VNTWIFIvQueryBSSList ( - void *pMgmtHandle, - PUINT puBSSCount, - void **pvFirstBSS - ) +VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirstBSS) { - UINT ii = 0; + unsigned int ii = 0; PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; PKnownBSS pBSS = NULL; - UINT uCount = 0; + unsigned int uCount = 0; *pvFirstBSS = NULL; @@ -497,15 +493,15 @@ VNTWIFIvGetNextBSS ( void VNTWIFIvUpdateNodeTxCounter( void *pMgmtHandle, - PBYTE pbyDestAddress, + unsigned char *pbyDestAddress, BOOL bTxOk, - WORD wRate, - PBYTE pbyTxFailCount + unsigned short wRate, + unsigned char *pbyTxFailCount ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; - UINT uNodeIndex = 0; - UINT ii; + unsigned int uNodeIndex = 0; + unsigned int ii; if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) || (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) { @@ -532,19 +528,19 @@ VNTWIFIvUpdateNodeTxCounter( void VNTWIFIvGetTxRate( void *pMgmtHandle, - PBYTE pbyDestAddress, - PWORD pwTxDataRate, - PBYTE pbyACKRate, - PBYTE pbyCCKBasicRate, - PBYTE pbyOFDMBasicRate + unsigned char *pbyDestAddress, + unsigned short *pwTxDataRate, + unsigned char *pbyACKRate, + unsigned char *pbyCCKBasicRate, + unsigned char *pbyOFDMBasicRate ) { PSMgmtObject pMgmt = (PSMgmtObject)pMgmtHandle; - UINT uNodeIndex = 0; - WORD wTxDataRate = RATE_1M; - BYTE byACKRate = RATE_1M; - BYTE byCCKBasicRate = RATE_1M; - BYTE byOFDMBasicRate = RATE_24M; + unsigned int uNodeIndex = 0; + unsigned short wTxDataRate = RATE_1M; + unsigned char byACKRate = RATE_1M; + unsigned char byCCKBasicRate = RATE_1M; + unsigned char byOFDMBasicRate = RATE_24M; PWLAN_IE_SUPP_RATES pSupportRateIEs = NULL; PWLAN_IE_SUPP_RATES pExtSupportRateIEs = NULL; @@ -579,12 +575,12 @@ VNTWIFIvGetTxRate( pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates; pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates; } - byACKRate = VNTWIFIbyGetACKTxRate( (BYTE) wTxDataRate, + byACKRate = VNTWIFIbyGetACKTxRate( (unsigned char) wTxDataRate, pSupportRateIEs, pExtSupportRateIEs ); - if (byACKRate > (BYTE) wTxDataRate) { - byACKRate = (BYTE) wTxDataRate; + if (byACKRate > (unsigned char) wTxDataRate) { + byACKRate = (unsigned char) wTxDataRate; } byCCKBasicRate = VNTWIFIbyGetACKTxRate( RATE_11M, pSupportRateIEs, @@ -601,7 +597,7 @@ VNTWIFIvGetTxRate( return; } -BYTE +unsigned char VNTWIFIbyGetKeyCypher( void *pMgmtHandle, BOOL bGroupKey @@ -626,7 +622,7 @@ VNTWIFIbInit( { PSMgmtObject pMgmt = NULL; - UINT ii; + unsigned int ii; pMgmt = (PSMgmtObject)kmalloc(sizeof(SMgmtObject), (int)GFP_ATOMIC); @@ -665,7 +661,7 @@ VNTWIFIbInit( BOOL VNTWIFIbSetPMKIDCache ( void *pMgmtObject, - ULONG ulCount, + unsigned long ulCount, void *pPMKIDInfo ) { @@ -681,12 +677,12 @@ VNTWIFIbSetPMKIDCache ( -WORD +unsigned short VNTWIFIwGetMaxSupportRate( void *pMgmtObject ) { - WORD wRate = RATE_54M; + unsigned short wRate = RATE_54M; PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; for(wRate = RATE_54M; wRate > RATE_1M; wRate--) { @@ -718,14 +714,14 @@ VNTWIFIbMeasureReport( void *pMgmtObject, BOOL bEndOfReport, void *pvMeasureEID, - BYTE byReportMode, - BYTE byBasicMap, - BYTE byCCAFraction, - PBYTE pbyRPIs + unsigned char byReportMode, + unsigned char byBasicMap, + unsigned char byCCAFraction, + unsigned char *pbyRPIs ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; - PBYTE pbyCurrentEID = (PBYTE) (pMgmt->pCurrMeasureEIDRep); + unsigned char *pbyCurrentEID = (unsigned char *) (pMgmt->pCurrMeasureEIDRep); //spin_lock_irq(&pDevice->lock); if ((pvMeasureEID != NULL) && @@ -776,7 +772,7 @@ VNTWIFIbMeasureReport( BOOL VNTWIFIbChannelSwitch( void *pMgmtObject, - BYTE byNewChannel + unsigned char byNewChannel ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; @@ -792,16 +788,16 @@ VNTWIFIbChannelSwitch( BOOL VNTWIFIbRadarPresent( void *pMgmtObject, - BYTE byChannel + unsigned char byChannel ) { PSMgmtObject pMgmt = (PSMgmtObject) pMgmtObject; if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && - (byChannel == (BYTE) pMgmt->uCurrChannel) && + (byChannel == (unsigned char) pMgmt->uCurrChannel) && (pMgmt->bSwitchChannel != TRUE) && (pMgmt->b11hEnable == TRUE)) { - if (IS_ETH_ADDRESS_EQUAL(pMgmt->abyIBSSDFSOwner, CARDpGetCurrentAddress(pMgmt->pAdapter))) { - pMgmt->byNewChannel = CARDbyAutoChannelSelect(pMgmt->pAdapter,(BYTE) pMgmt->uCurrChannel); + if (!compare_ether_addr(pMgmt->abyIBSSDFSOwner, CARDpGetCurrentAddress(pMgmt->pAdapter))) { + pMgmt->byNewChannel = CARDbyAutoChannelSelect(pMgmt->pAdapter,(unsigned char) pMgmt->uCurrChannel); pMgmt->bSwitchChannel = TRUE; } BEACONbSendBeacon(pMgmt); |