Loading drivers/staging/vt6656/80211mgr.h +24 −24 Original line number Diff line number Diff line Loading @@ -524,8 +524,8 @@ typedef struct _WLAN_IE_IBSS_DFS { // prototype structure, all mgmt frame types will start with these members typedef struct tagWLAN_FR_MGMT { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; Loading @@ -534,8 +534,8 @@ typedef struct tagWLAN_FR_MGMT { // Beacon frame typedef struct tagWLAN_FR_BEACON { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; // fixed fields Loading Loading @@ -566,8 +566,8 @@ typedef struct tagWLAN_FR_BEACON { // IBSS ATIM frame typedef struct tagWLAN_FR_IBSSATIM { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; Loading @@ -580,8 +580,8 @@ typedef struct tagWLAN_FR_IBSSATIM { // Disassociation typedef struct tagWLAN_FR_DISASSOC { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -593,8 +593,8 @@ typedef struct tagWLAN_FR_DISASSOC { // Association Request typedef struct tagWLAN_FR_ASSOCREQ { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -617,8 +617,8 @@ typedef struct tagWLAN_FR_ASSOCREQ { // Association Response typedef struct tagWLAN_FR_ASSOCRESP { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -634,8 +634,8 @@ typedef struct tagWLAN_FR_ASSOCRESP { // Reassociation Request typedef struct tagWLAN_FR_REASSOCREQ { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; Loading @@ -659,8 +659,8 @@ typedef struct tagWLAN_FR_REASSOCREQ { // Reassociation Response typedef struct tagWLAN_FR_REASSOCRESP { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -676,8 +676,8 @@ typedef struct tagWLAN_FR_REASSOCRESP { // Probe Request typedef struct tagWLAN_FR_PROBEREQ { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -691,8 +691,8 @@ typedef struct tagWLAN_FR_PROBEREQ { // Probe Response typedef struct tagWLAN_FR_PROBERESP { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading Loading @@ -720,8 +720,8 @@ typedef struct tagWLAN_FR_PROBERESP { // Authentication typedef struct tagWLAN_FR_AUTHEN { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -736,8 +736,8 @@ typedef struct tagWLAN_FR_AUTHEN { // Deauthenication typedef struct tagWLAN_FR_DEAUTHEN { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading drivers/staging/vt6656/baseband.c +23 −29 Original line number Diff line number Diff line Loading @@ -662,11 +662,11 @@ const WORD awcFrameTime[MAX_RATE] = /* static ULONG unsigned long s_ulGetLowSQ3(PSDevice pDevice); static ULONG unsigned long s_ulGetRatio(PSDevice pDevice); static Loading @@ -689,19 +689,19 @@ s_vClearSQ3Value(PSDevice pDevice); * Return Value: FrameTime * */ UINT unsigned int BBuGetFrameTime ( BYTE byPreambleType, BYTE byPktType, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate ) { UINT uFrameTime; UINT uPreamble; UINT uTmp; UINT uRateIdx = (UINT)wRate; UINT uRate = 0; unsigned int uFrameTime; unsigned int uPreamble; unsigned int uTmp; unsigned int uRateIdx = (unsigned int)wRate; unsigned int uRate = 0; if (uRateIdx > RATE_54M) { Loading @@ -709,7 +709,7 @@ BBuGetFrameTime ( return 0; } uRate = (UINT)awcFrameTime[uRateIdx]; uRate = (unsigned int)awcFrameTime[uRateIdx]; if (uRateIdx <= 3) { //CCK mode Loading Loading @@ -759,7 +759,7 @@ BBuGetFrameTime ( void BBvCaculateParameter ( PSDevice pDevice, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate, BYTE byPacketType, PWORD pwPhyLen, Loading @@ -767,9 +767,9 @@ BBvCaculateParameter ( PBYTE pbyPhySgn ) { UINT cbBitCount; UINT cbUsCount = 0; UINT cbTmp; unsigned int cbBitCount; unsigned int cbUsCount = 0; unsigned int cbTmp; BOOL bExtBit; BYTE byPreambleType = pDevice->byPreambleType; BOOL bCCK = pDevice->bCCK; Loading Loading @@ -1360,13 +1360,11 @@ BBvExitDeepSleep (PSDevice pDevice) } static ULONG s_ulGetLowSQ3(PSDevice pDevice) static unsigned long s_ulGetLowSQ3(PSDevice pDevice) { int ii; ULONG ulSQ3 = 0; ULONG ulMaxPacket; unsigned long ulSQ3 = 0; unsigned long ulMaxPacket; ulMaxPacket = pDevice->aulPktNum[RATE_54M]; if ( pDevice->aulPktNum[RATE_54M] != 0 ) { Loading @@ -1382,16 +1380,12 @@ ULONG ulMaxPacket; return ulSQ3; } static ULONG s_ulGetRatio (PSDevice pDevice) static unsigned long s_ulGetRatio(PSDevice pDevice) { int ii, jj; ULONG ulRatio = 0; ULONG ulMaxPacket; ULONG ulPacketNum; unsigned long ulRatio = 0; unsigned long ulMaxPacket; unsigned long ulPacketNum; //This is a thousand-ratio ulMaxPacket = pDevice->aulPktNum[RATE_54M]; Loading drivers/staging/vt6656/baseband.h +3 −3 Original line number Diff line number Diff line Loading @@ -96,18 +96,18 @@ /*--------------------- Export Functions --------------------------*/ UINT unsigned int BBuGetFrameTime( BYTE byPreambleType, BYTE byFreqType, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate ); void BBvCaculateParameter ( PSDevice pDevice, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate, BYTE byPacketType, PWORD pwPhyLen, Loading drivers/staging/vt6656/bssdb.c +57 −52 Original line number Diff line number Diff line Loading @@ -129,8 +129,8 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, PKnownBSS pCurrBSS = NULL; PKnownBSS pSelect = NULL; BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00}; UINT ii = 0; UINT jj = 0; //DavidWang unsigned int ii = 0; unsigned int jj = 0; if (pbyDesireBSSID != NULL) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n", *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2), Loading Loading @@ -291,7 +291,7 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; for (ii = 0; ii < MAX_BSS_NUM; ii++) { if (bKeepCurrBSSID) { Loading Loading @@ -336,7 +336,7 @@ PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext, PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PKnownBSS pBSSList = NULL; UINT ii; unsigned int ii; for (ii = 0; ii < MAX_BSS_NUM; ii++) { pBSSList = &(pMgmt->sBSSList[ii]); Loading Loading @@ -381,7 +381,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext) { Loading @@ -390,7 +390,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PKnownBSS pBSSList = NULL; UINT ii; unsigned int ii; BOOL bParsingQuiet = FALSE; Loading Loading @@ -465,9 +465,10 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, WPA_ClearRSN(pBSSList); if (pRSNWPA != NULL) { UINT uLen = pRSNWPA->len + 2; unsigned int uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) { pBSSList->wWPALen = uLen; memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); WPA_ParseRSN(pBSSList, pRSNWPA); Loading @@ -477,8 +478,10 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, WPA2_ClearRSN(pBSSList); if (pRSN != NULL) { UINT uLen = pRSN->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { unsigned int uLen = pRSN->len + 2; if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) { pBSSList->wRSNLen = uLen; memcpy(pBSSList->byRSNIE, pRSN, uLen); WPA2vParseRSN(pBSSList, pRSN); Loading Loading @@ -600,7 +603,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, PKnownBSS pBSSList, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext) { Loading Loading @@ -668,8 +671,9 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, WPA_ClearRSN(pBSSList); //mike update if (pRSNWPA != NULL) { UINT uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { unsigned int uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) { pBSSList->wWPALen = uLen; memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); WPA_ParseRSN(pBSSList, pRSNWPA); Loading @@ -679,8 +683,9 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, WPA2_ClearRSN(pBSSList); //mike update if (pRSN != NULL) { UINT uLen = pRSN->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { unsigned int uLen = pRSN->len + 2; if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) { pBSSList->wRSNLen = uLen; memcpy(pBSSList->byRSNIE, pRSN, uLen); WPA2vParseRSN(pBSSList, pRSN); Loading Loading @@ -754,7 +759,7 @@ BOOL BSSbIsSTAInNodeDB(void *hDeviceContext, { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; // Index = 0 reserved for AP Node for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) { Loading Loading @@ -786,9 +791,9 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex) PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; UINT BigestCount = 0; UINT SelectIndex; unsigned int ii; unsigned int BigestCount = 0; unsigned int SelectIndex; struct sk_buff *skb; // Index = 0 reserved for AP Node (In STA mode) // Index = 0 reserved for Broadcast/MultiCast (In AP mode) Loading Loading @@ -843,7 +848,7 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex) * -*/ void BSSvRemoveOneNode(void *hDeviceContext, UINT uNodeIndex) void BSSvRemoveOneNode(void *hDeviceContext, unsigned int uNodeIndex) { PSDevice pDevice = (PSDevice)hDeviceContext; Loading Loading @@ -879,7 +884,7 @@ void BSSvUpdateAPNode(void *hDeviceContext, { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN; memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB)); Loading Loading @@ -967,11 +972,11 @@ void BSSvSecondCallBack(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; PWLAN_IE_SSID pItemSSID, pCurrSSID; UINT uSleepySTACnt = 0; UINT uNonShortSlotSTACnt = 0; UINT uLongPreambleSTACnt = 0; unsigned int uSleepySTACnt = 0; unsigned int uNonShortSlotSTACnt = 0; unsigned int uLongPreambleSTACnt = 0; viawget_wpa_header *wpahdr; //DavidWang spin_lock_irq(&pDevice->lock); Loading Loading @@ -1360,12 +1365,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT uNodeIndex = 0; unsigned int uNodeIndex = 0; BYTE byTxRetry; WORD wRate; WORD wFallBackRate = RATE_1M; BYTE byFallBack; UINT ii; unsigned int ii; PBYTE pbyDestAddr; BYTE byPktNum; WORD wFIFOCtl; Loading Loading @@ -1516,12 +1521,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, -*/ void BSSvClearNodeDBTable(void *hDeviceContext, UINT uStartIndex) unsigned int uStartIndex) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); struct sk_buff *skb; UINT ii; unsigned int ii; for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) { if (pMgmt->sNodeDBTable[ii].bActive) { Loading Loading @@ -1586,9 +1591,9 @@ void s_vCheckSensitivity(void *hDeviceContext) void s_uCalculateLinkQual(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; ULONG TxOkRatio, TxCnt; ULONG RxOkRatio,RxCnt; ULONG RssiRatio; unsigned long TxOkRatio, TxCnt; unsigned long RxOkRatio, RxCnt; unsigned long RssiRatio; long ldBm; TxCnt = pDevice->scStatistic.TxNoRetryOkCount + Loading Loading @@ -1633,7 +1638,7 @@ void BSSvClearAnyBSSJoinRecord(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; for (ii = 0; ii < MAX_BSS_NUM; ii++) { pMgmt->sBSSList[ii].bSelected = FALSE; Loading drivers/staging/vt6656/bssdb.h +24 −24 Original line number Diff line number Diff line Loading @@ -97,10 +97,10 @@ typedef struct tagKnownBSS { // BSS info BOOL bActive; BYTE abyBSSID[WLAN_BSSID_LEN]; UINT uChannel; unsigned int uChannel; BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; UINT uRSSI; unsigned int uRSSI; BYTE bySQ; WORD wBeaconInterval; WORD wCapInfo; Loading Loading @@ -141,9 +141,9 @@ typedef struct tagKnownBSS { WORD wRSNLen; // Clear count UINT uClearCount; unsigned int uClearCount; // BYTE abyIEs[WLAN_BEACON_FR_MAXLEN]; UINT uIELength; unsigned int uIELength; QWORD qwBSSTimestamp; QWORD qwLocalTSF; // local TSF timer Loading Loading @@ -178,7 +178,7 @@ typedef struct tagKnownNodeDB { BOOL bShortPreamble; BOOL bERPExist; BOOL bShortSlotTime; UINT uInActiveCount; unsigned int uInActiveCount; WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. WORD wSuppRate; Loading @@ -194,35 +194,35 @@ typedef struct tagKnownNodeDB { BOOL bPSEnable; BOOL bRxPSPoll; BYTE byAuthSequence; ULONG ulLastRxJiffer; unsigned long ulLastRxJiffer; BYTE bySuppRate; DWORD dwFlags; WORD wEnQueueCnt; BOOL bOnFly; ULONGLONG KeyRSC; unsigned long long KeyRSC; BYTE byKeyIndex; DWORD dwKeyIndex; BYTE byCipherSuite; DWORD dwTSC47_16; WORD wTSC15_0; UINT uWepKeyLength; unsigned int uWepKeyLength; BYTE abyWepKey[WLAN_WEPMAX_KEYLEN]; // // Auto rate fallback vars BOOL bIsInFallback; UINT uAverageRSSI; UINT uRateRecoveryTimeout; UINT uRatePollTimeout; UINT uTxFailures; UINT uTxAttempts; UINT uTxRetry; UINT uFailureRatio; UINT uRetryRatio; UINT uTxOk[MAX_RATE+1]; UINT uTxFail[MAX_RATE+1]; UINT uTimeCount; unsigned int uAverageRSSI; unsigned int uRateRecoveryTimeout; unsigned int uRatePollTimeout; unsigned int uTxFailures; unsigned int uTxAttempts; unsigned int uTxRetry; unsigned int uFailureRatio; unsigned int uRetryRatio; unsigned int uTxOk[MAX_RATE+1]; unsigned int uTxFail[MAX_RATE+1]; unsigned int uTimeCount; } KnownNodeDB, *PKnownNodeDB; Loading Loading @@ -253,7 +253,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext); Loading @@ -272,7 +272,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, PKnownBSS pBSSList, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext); Loading @@ -295,12 +295,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, BYTE byPktNO); void BSSvRemoveOneNode(void *hDeviceContext, UINT uNodeIndex); unsigned int uNodeIndex); void BSSvAddMulticastNode(void *hDeviceContext); void BSSvClearNodeDBTable(void *hDeviceContext, UINT uStartIndex); unsigned int uStartIndex); void BSSvClearAnyBSSJoinRecord(void *hDeviceContext); Loading Loading
drivers/staging/vt6656/80211mgr.h +24 −24 Original line number Diff line number Diff line Loading @@ -524,8 +524,8 @@ typedef struct _WLAN_IE_IBSS_DFS { // prototype structure, all mgmt frame types will start with these members typedef struct tagWLAN_FR_MGMT { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; Loading @@ -534,8 +534,8 @@ typedef struct tagWLAN_FR_MGMT { // Beacon frame typedef struct tagWLAN_FR_BEACON { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; // fixed fields Loading Loading @@ -566,8 +566,8 @@ typedef struct tagWLAN_FR_BEACON { // IBSS ATIM frame typedef struct tagWLAN_FR_IBSSATIM { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; Loading @@ -580,8 +580,8 @@ typedef struct tagWLAN_FR_IBSSATIM { // Disassociation typedef struct tagWLAN_FR_DISASSOC { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -593,8 +593,8 @@ typedef struct tagWLAN_FR_DISASSOC { // Association Request typedef struct tagWLAN_FR_ASSOCREQ { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -617,8 +617,8 @@ typedef struct tagWLAN_FR_ASSOCREQ { // Association Response typedef struct tagWLAN_FR_ASSOCRESP { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -634,8 +634,8 @@ typedef struct tagWLAN_FR_ASSOCRESP { // Reassociation Request typedef struct tagWLAN_FR_REASSOCREQ { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; Loading @@ -659,8 +659,8 @@ typedef struct tagWLAN_FR_REASSOCREQ { // Reassociation Response typedef struct tagWLAN_FR_REASSOCRESP { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -676,8 +676,8 @@ typedef struct tagWLAN_FR_REASSOCRESP { // Probe Request typedef struct tagWLAN_FR_PROBEREQ { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -691,8 +691,8 @@ typedef struct tagWLAN_FR_PROBEREQ { // Probe Response typedef struct tagWLAN_FR_PROBERESP { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading Loading @@ -720,8 +720,8 @@ typedef struct tagWLAN_FR_PROBERESP { // Authentication typedef struct tagWLAN_FR_AUTHEN { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading @@ -736,8 +736,8 @@ typedef struct tagWLAN_FR_AUTHEN { // Deauthenication typedef struct tagWLAN_FR_DEAUTHEN { UINT uType; UINT len; unsigned int uType; unsigned int len; PBYTE pBuf; PUWLAN_80211HDR pHdr; /*-- fixed fields -----------*/ Loading
drivers/staging/vt6656/baseband.c +23 −29 Original line number Diff line number Diff line Loading @@ -662,11 +662,11 @@ const WORD awcFrameTime[MAX_RATE] = /* static ULONG unsigned long s_ulGetLowSQ3(PSDevice pDevice); static ULONG unsigned long s_ulGetRatio(PSDevice pDevice); static Loading @@ -689,19 +689,19 @@ s_vClearSQ3Value(PSDevice pDevice); * Return Value: FrameTime * */ UINT unsigned int BBuGetFrameTime ( BYTE byPreambleType, BYTE byPktType, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate ) { UINT uFrameTime; UINT uPreamble; UINT uTmp; UINT uRateIdx = (UINT)wRate; UINT uRate = 0; unsigned int uFrameTime; unsigned int uPreamble; unsigned int uTmp; unsigned int uRateIdx = (unsigned int)wRate; unsigned int uRate = 0; if (uRateIdx > RATE_54M) { Loading @@ -709,7 +709,7 @@ BBuGetFrameTime ( return 0; } uRate = (UINT)awcFrameTime[uRateIdx]; uRate = (unsigned int)awcFrameTime[uRateIdx]; if (uRateIdx <= 3) { //CCK mode Loading Loading @@ -759,7 +759,7 @@ BBuGetFrameTime ( void BBvCaculateParameter ( PSDevice pDevice, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate, BYTE byPacketType, PWORD pwPhyLen, Loading @@ -767,9 +767,9 @@ BBvCaculateParameter ( PBYTE pbyPhySgn ) { UINT cbBitCount; UINT cbUsCount = 0; UINT cbTmp; unsigned int cbBitCount; unsigned int cbUsCount = 0; unsigned int cbTmp; BOOL bExtBit; BYTE byPreambleType = pDevice->byPreambleType; BOOL bCCK = pDevice->bCCK; Loading Loading @@ -1360,13 +1360,11 @@ BBvExitDeepSleep (PSDevice pDevice) } static ULONG s_ulGetLowSQ3(PSDevice pDevice) static unsigned long s_ulGetLowSQ3(PSDevice pDevice) { int ii; ULONG ulSQ3 = 0; ULONG ulMaxPacket; unsigned long ulSQ3 = 0; unsigned long ulMaxPacket; ulMaxPacket = pDevice->aulPktNum[RATE_54M]; if ( pDevice->aulPktNum[RATE_54M] != 0 ) { Loading @@ -1382,16 +1380,12 @@ ULONG ulMaxPacket; return ulSQ3; } static ULONG s_ulGetRatio (PSDevice pDevice) static unsigned long s_ulGetRatio(PSDevice pDevice) { int ii, jj; ULONG ulRatio = 0; ULONG ulMaxPacket; ULONG ulPacketNum; unsigned long ulRatio = 0; unsigned long ulMaxPacket; unsigned long ulPacketNum; //This is a thousand-ratio ulMaxPacket = pDevice->aulPktNum[RATE_54M]; Loading
drivers/staging/vt6656/baseband.h +3 −3 Original line number Diff line number Diff line Loading @@ -96,18 +96,18 @@ /*--------------------- Export Functions --------------------------*/ UINT unsigned int BBuGetFrameTime( BYTE byPreambleType, BYTE byFreqType, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate ); void BBvCaculateParameter ( PSDevice pDevice, UINT cbFrameLength, unsigned int cbFrameLength, WORD wRate, BYTE byPacketType, PWORD pwPhyLen, Loading
drivers/staging/vt6656/bssdb.c +57 −52 Original line number Diff line number Diff line Loading @@ -129,8 +129,8 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, PKnownBSS pCurrBSS = NULL; PKnownBSS pSelect = NULL; BYTE ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00}; UINT ii = 0; UINT jj = 0; //DavidWang unsigned int ii = 0; unsigned int jj = 0; if (pbyDesireBSSID != NULL) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n", *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2), Loading Loading @@ -291,7 +291,7 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; for (ii = 0; ii < MAX_BSS_NUM; ii++) { if (bKeepCurrBSSID) { Loading Loading @@ -336,7 +336,7 @@ PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext, PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PKnownBSS pBSSList = NULL; UINT ii; unsigned int ii; for (ii = 0; ii < MAX_BSS_NUM; ii++) { pBSSList = &(pMgmt->sBSSList[ii]); Loading Loading @@ -381,7 +381,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext) { Loading @@ -390,7 +390,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSRxMgmtPacket pRxPacket = (PSRxMgmtPacket)pRxPacketContext; PKnownBSS pBSSList = NULL; UINT ii; unsigned int ii; BOOL bParsingQuiet = FALSE; Loading Loading @@ -465,9 +465,10 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, WPA_ClearRSN(pBSSList); if (pRSNWPA != NULL) { UINT uLen = pRSNWPA->len + 2; unsigned int uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) { pBSSList->wWPALen = uLen; memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); WPA_ParseRSN(pBSSList, pRSNWPA); Loading @@ -477,8 +478,10 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, WPA2_ClearRSN(pBSSList); if (pRSN != NULL) { UINT uLen = pRSN->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { unsigned int uLen = pRSN->len + 2; if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) { pBSSList->wRSNLen = uLen; memcpy(pBSSList->byRSNIE, pRSN, uLen); WPA2vParseRSN(pBSSList, pRSN); Loading Loading @@ -600,7 +603,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, PKnownBSS pBSSList, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext) { Loading Loading @@ -668,8 +671,9 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, WPA_ClearRSN(pBSSList); //mike update if (pRSNWPA != NULL) { UINT uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) { unsigned int uLen = pRSNWPA->len + 2; if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) { pBSSList->wWPALen = uLen; memcpy(pBSSList->byWPAIE, pRSNWPA, uLen); WPA_ParseRSN(pBSSList, pRSNWPA); Loading @@ -679,8 +683,9 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, WPA2_ClearRSN(pBSSList); //mike update if (pRSN != NULL) { UINT uLen = pRSN->len + 2; if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) { unsigned int uLen = pRSN->len + 2; if (uLen <= (uIELength - (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) { pBSSList->wRSNLen = uLen; memcpy(pBSSList->byRSNIE, pRSN, uLen); WPA2vParseRSN(pBSSList, pRSN); Loading Loading @@ -754,7 +759,7 @@ BOOL BSSbIsSTAInNodeDB(void *hDeviceContext, { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; // Index = 0 reserved for AP Node for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) { Loading Loading @@ -786,9 +791,9 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex) PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; UINT BigestCount = 0; UINT SelectIndex; unsigned int ii; unsigned int BigestCount = 0; unsigned int SelectIndex; struct sk_buff *skb; // Index = 0 reserved for AP Node (In STA mode) // Index = 0 reserved for Broadcast/MultiCast (In AP mode) Loading Loading @@ -843,7 +848,7 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex) * -*/ void BSSvRemoveOneNode(void *hDeviceContext, UINT uNodeIndex) void BSSvRemoveOneNode(void *hDeviceContext, unsigned int uNodeIndex) { PSDevice pDevice = (PSDevice)hDeviceContext; Loading Loading @@ -879,7 +884,7 @@ void BSSvUpdateAPNode(void *hDeviceContext, { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT uRateLen = WLAN_RATES_MAXLEN; unsigned int uRateLen = WLAN_RATES_MAXLEN; memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB)); Loading Loading @@ -967,11 +972,11 @@ void BSSvSecondCallBack(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; PWLAN_IE_SSID pItemSSID, pCurrSSID; UINT uSleepySTACnt = 0; UINT uNonShortSlotSTACnt = 0; UINT uLongPreambleSTACnt = 0; unsigned int uSleepySTACnt = 0; unsigned int uNonShortSlotSTACnt = 0; unsigned int uLongPreambleSTACnt = 0; viawget_wpa_header *wpahdr; //DavidWang spin_lock_irq(&pDevice->lock); Loading Loading @@ -1360,12 +1365,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT uNodeIndex = 0; unsigned int uNodeIndex = 0; BYTE byTxRetry; WORD wRate; WORD wFallBackRate = RATE_1M; BYTE byFallBack; UINT ii; unsigned int ii; PBYTE pbyDestAddr; BYTE byPktNum; WORD wFIFOCtl; Loading Loading @@ -1516,12 +1521,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, -*/ void BSSvClearNodeDBTable(void *hDeviceContext, UINT uStartIndex) unsigned int uStartIndex) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); struct sk_buff *skb; UINT ii; unsigned int ii; for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) { if (pMgmt->sNodeDBTable[ii].bActive) { Loading Loading @@ -1586,9 +1591,9 @@ void s_vCheckSensitivity(void *hDeviceContext) void s_uCalculateLinkQual(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; ULONG TxOkRatio, TxCnt; ULONG RxOkRatio,RxCnt; ULONG RssiRatio; unsigned long TxOkRatio, TxCnt; unsigned long RxOkRatio, RxCnt; unsigned long RssiRatio; long ldBm; TxCnt = pDevice->scStatistic.TxNoRetryOkCount + Loading Loading @@ -1633,7 +1638,7 @@ void BSSvClearAnyBSSJoinRecord(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; PSMgmtObject pMgmt = &(pDevice->sMgmtObj); UINT ii; unsigned int ii; for (ii = 0; ii < MAX_BSS_NUM; ii++) { pMgmt->sBSSList[ii].bSelected = FALSE; Loading
drivers/staging/vt6656/bssdb.h +24 −24 Original line number Diff line number Diff line Loading @@ -97,10 +97,10 @@ typedef struct tagKnownBSS { // BSS info BOOL bActive; BYTE abyBSSID[WLAN_BSSID_LEN]; UINT uChannel; unsigned int uChannel; BYTE abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; BYTE abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1]; UINT uRSSI; unsigned int uRSSI; BYTE bySQ; WORD wBeaconInterval; WORD wCapInfo; Loading Loading @@ -141,9 +141,9 @@ typedef struct tagKnownBSS { WORD wRSNLen; // Clear count UINT uClearCount; unsigned int uClearCount; // BYTE abyIEs[WLAN_BEACON_FR_MAXLEN]; UINT uIELength; unsigned int uIELength; QWORD qwBSSTimestamp; QWORD qwLocalTSF; // local TSF timer Loading Loading @@ -178,7 +178,7 @@ typedef struct tagKnownNodeDB { BOOL bShortPreamble; BOOL bERPExist; BOOL bShortSlotTime; UINT uInActiveCount; unsigned int uInActiveCount; WORD wMaxBasicRate; //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp. WORD wMaxSuppRate; //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon. WORD wSuppRate; Loading @@ -194,35 +194,35 @@ typedef struct tagKnownNodeDB { BOOL bPSEnable; BOOL bRxPSPoll; BYTE byAuthSequence; ULONG ulLastRxJiffer; unsigned long ulLastRxJiffer; BYTE bySuppRate; DWORD dwFlags; WORD wEnQueueCnt; BOOL bOnFly; ULONGLONG KeyRSC; unsigned long long KeyRSC; BYTE byKeyIndex; DWORD dwKeyIndex; BYTE byCipherSuite; DWORD dwTSC47_16; WORD wTSC15_0; UINT uWepKeyLength; unsigned int uWepKeyLength; BYTE abyWepKey[WLAN_WEPMAX_KEYLEN]; // // Auto rate fallback vars BOOL bIsInFallback; UINT uAverageRSSI; UINT uRateRecoveryTimeout; UINT uRatePollTimeout; UINT uTxFailures; UINT uTxAttempts; UINT uTxRetry; UINT uFailureRatio; UINT uRetryRatio; UINT uTxOk[MAX_RATE+1]; UINT uTxFail[MAX_RATE+1]; UINT uTimeCount; unsigned int uAverageRSSI; unsigned int uRateRecoveryTimeout; unsigned int uRatePollTimeout; unsigned int uTxFailures; unsigned int uTxAttempts; unsigned int uTxRetry; unsigned int uFailureRatio; unsigned int uRetryRatio; unsigned int uTxOk[MAX_RATE+1]; unsigned int uTxFail[MAX_RATE+1]; unsigned int uTimeCount; } KnownNodeDB, *PKnownNodeDB; Loading Loading @@ -253,7 +253,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, PWLAN_IE_RSN_EXT pRSNWPA, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext); Loading @@ -272,7 +272,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, PWLAN_IE_COUNTRY pIE_Country, PWLAN_IE_QUIET pIE_Quiet, PKnownBSS pBSSList, UINT uIELength, unsigned int uIELength, PBYTE pbyIEs, void *pRxPacketContext); Loading @@ -295,12 +295,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, BYTE byPktNO); void BSSvRemoveOneNode(void *hDeviceContext, UINT uNodeIndex); unsigned int uNodeIndex); void BSSvAddMulticastNode(void *hDeviceContext); void BSSvClearNodeDBTable(void *hDeviceContext, UINT uStartIndex); unsigned int uStartIndex); void BSSvClearAnyBSSJoinRecord(void *hDeviceContext); Loading