Skip to content

L
linux
Commit b2e876b6 authored by Charles Clément's avatar Charles Clément Committed by Greg Kroah-Hartman
Browse files
Options

Staging: vt6655: remove custom ULONGLONG typedef 

Signed-off-by: default avatarCharles Clément <caratorn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e3fd16d0
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 91 deletions
drivers/staging/vt6655/bssdb.h
View file @ b2e876b6
...@@ -211,7 +211,7 @@ typedef struct tagKnownNodeDB { ...@@ -211,7 +211,7 @@ typedef struct tagKnownNodeDB {
WORD wEnQueueCnt; WORD wEnQueueCnt;
BOOL bOnFly; BOOL bOnFly;
ULONGLONG KeyRSC; unsigned long long KeyRSC;
BYTE byKeyIndex; BYTE byKeyIndex;
DWORD dwKeyIndex; DWORD dwKeyIndex;
BYTE byCipherSuite; BYTE byCipherSuite;
......
drivers/staging/vt6655/dpc.c
View file @ b2e876b6
...@@ -919,9 +919,9 @@ device_receive_frame ( ...@@ -919,9 +919,9 @@ device_receive_frame (
if (bIsWEP) { if (bIsWEP) {
WORD wLocalTSC15_0 = 0; WORD wLocalTSC15_0 = 0;
DWORD dwLocalTSC47_16 = 0; DWORD dwLocalTSC47_16 = 0;
ULONGLONG RSC = 0; unsigned long long RSC = 0;
// endian issues // endian issues
RSC = *((ULONGLONG *) &(pKey->KeyRSC)); RSC = *((unsigned long long *) &(pKey->KeyRSC));
wLocalTSC15_0 = (WORD) RSC; wLocalTSC15_0 = (WORD) RSC;
dwLocalTSC47_16 = (DWORD) (RSC>>16); dwLocalTSC47_16 = (DWORD) (RSC>>16);
......
drivers/staging/vt6655/mib.c
View file @ b2e876b6
...@@ -194,15 +194,15 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, ...@@ -194,15 +194,15 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic,
// update counters in case that successful transmit // update counters in case that successful transmit
if (byRSR & RSR_ADDRBROAD) { if (byRSR & RSR_ADDRBROAD) {
pStatistic->ullRxBroadcastFrames++; pStatistic->ullRxBroadcastFrames++;
pStatistic->ullRxBroadcastBytes += (ULONGLONG)cbFrameLength; pStatistic->ullRxBroadcastBytes += (unsigned long long) cbFrameLength;
} }
else if (byRSR & RSR_ADDRMULTI) { else if (byRSR & RSR_ADDRMULTI) {
pStatistic->ullRxMulticastFrames++; pStatistic->ullRxMulticastFrames++;
pStatistic->ullRxMulticastBytes += (ULONGLONG)cbFrameLength; pStatistic->ullRxMulticastBytes += (unsigned long long) cbFrameLength;
} }
else { else {
pStatistic->ullRxDirectedFrames++; pStatistic->ullRxDirectedFrames++;
pStatistic->ullRxDirectedBytes += (ULONGLONG)cbFrameLength; pStatistic->ullRxDirectedBytes += (unsigned long long) cbFrameLength;
} }
} }
} }
...@@ -473,15 +473,15 @@ STAvUpdateTDStatCounter ( ...@@ -473,15 +473,15 @@ STAvUpdateTDStatCounter (
// update counters in case that successful transmit // update counters in case that successful transmit
if (is_broadcast_ether_addr(pbyDestAddr)) { if (is_broadcast_ether_addr(pbyDestAddr)) {
pStatistic->ullTxBroadcastFrames[uIdx]++; pStatistic->ullTxBroadcastFrames[uIdx]++;
pStatistic->ullTxBroadcastBytes[uIdx] += (ULONGLONG)cbFrameLength; pStatistic->ullTxBroadcastBytes[uIdx] += (unsigned long long) cbFrameLength;
} }
else if (is_multicast_ether_addr(pbyDestAddr)) { else if (is_multicast_ether_addr(pbyDestAddr)) {
pStatistic->ullTxMulticastFrames[uIdx]++; pStatistic->ullTxMulticastFrames[uIdx]++;
pStatistic->ullTxMulticastBytes[uIdx] += (ULONGLONG)cbFrameLength; pStatistic->ullTxMulticastBytes[uIdx] += (unsigned long long) cbFrameLength;
} }
else { else {
pStatistic->ullTxDirectedFrames[uIdx]++; pStatistic->ullTxDirectedFrames[uIdx]++;
pStatistic->ullTxDirectedBytes[uIdx] += (ULONGLONG)cbFrameLength; pStatistic->ullTxDirectedBytes[uIdx] += (unsigned long long) cbFrameLength;
} }
} }
else { else {
...@@ -559,21 +559,21 @@ STAvUpdate802_11Counter( ...@@ -559,21 +559,21 @@ STAvUpdate802_11Counter(
) )
{ {
//p802_11Counter->TransmittedFragmentCount //p802_11Counter->TransmittedFragmentCount
p802_11Counter->MulticastTransmittedFrameCount = (ULONGLONG) (pStatistic->dwTsrBroadcast[TYPE_AC0DMA] + p802_11Counter->MulticastTransmittedFrameCount = (unsigned long long) (pStatistic->dwTsrBroadcast[TYPE_AC0DMA] +
pStatistic->dwTsrBroadcast[TYPE_TXDMA0] + pStatistic->dwTsrBroadcast[TYPE_TXDMA0] +
pStatistic->dwTsrMulticast[TYPE_AC0DMA] + pStatistic->dwTsrMulticast[TYPE_AC0DMA] +
pStatistic->dwTsrMulticast[TYPE_TXDMA0]); pStatistic->dwTsrMulticast[TYPE_TXDMA0]);
p802_11Counter->FailedCount = (ULONGLONG) (pStatistic->dwTsrErr[TYPE_AC0DMA] + pStatistic->dwTsrErr[TYPE_TXDMA0]); p802_11Counter->FailedCount = (unsigned long long) (pStatistic->dwTsrErr[TYPE_AC0DMA] + pStatistic->dwTsrErr[TYPE_TXDMA0]);
p802_11Counter->RetryCount = (ULONGLONG) (pStatistic->dwTsrRetry[TYPE_AC0DMA] + pStatistic->dwTsrRetry[TYPE_TXDMA0]); p802_11Counter->RetryCount = (unsigned long long) (pStatistic->dwTsrRetry[TYPE_AC0DMA] + pStatistic->dwTsrRetry[TYPE_TXDMA0]);
p802_11Counter->MultipleRetryCount = (ULONGLONG) (pStatistic->dwTsrMoreThanOnceRetry[TYPE_AC0DMA] + p802_11Counter->MultipleRetryCount = (unsigned long long) (pStatistic->dwTsrMoreThanOnceRetry[TYPE_AC0DMA] +
pStatistic->dwTsrMoreThanOnceRetry[TYPE_TXDMA0]); pStatistic->dwTsrMoreThanOnceRetry[TYPE_TXDMA0]);
//p802_11Counter->FrameDuplicateCount //p802_11Counter->FrameDuplicateCount
p802_11Counter->RTSSuccessCount += (ULONGLONG) (dwCounter & 0x000000ff); p802_11Counter->RTSSuccessCount += (unsigned long long) (dwCounter & 0x000000ff);
p802_11Counter->RTSFailureCount += (ULONGLONG) ((dwCounter & 0x0000ff00) >> 8); p802_11Counter->RTSFailureCount += (unsigned long long) ((dwCounter & 0x0000ff00) >> 8);
p802_11Counter->ACKFailureCount += (ULONGLONG) ((dwCounter & 0x00ff0000) >> 16); p802_11Counter->ACKFailureCount += (unsigned long long) ((dwCounter & 0x00ff0000) >> 16);
p802_11Counter->FCSErrorCount += (ULONGLONG) ((dwCounter & 0xff000000) >> 24); p802_11Counter->FCSErrorCount += (unsigned long long) ((dwCounter & 0xff000000) >> 24);
//p802_11Counter->ReceivedFragmentCount //p802_11Counter->ReceivedFragmentCount
p802_11Counter->MulticastReceivedFrameCount = (ULONGLONG) (pStatistic->dwRsrBroadcast + p802_11Counter->MulticastReceivedFrameCount = (unsigned long long) (pStatistic->dwRsrBroadcast +
pStatistic->dwRsrMulticast); pStatistic->dwRsrMulticast);
} }
......
drivers/staging/vt6655/mib.h
View file @ b2e876b6
...@@ -40,31 +40,31 @@ ...@@ -40,31 +40,31 @@
typedef struct tagSDot11Counters { typedef struct tagSDot11Counters {
unsigned long Length; // Length of structure unsigned long Length; // Length of structure
ULONGLONG TransmittedFragmentCount; unsigned long long TransmittedFragmentCount;
ULONGLONG MulticastTransmittedFrameCount; unsigned long long MulticastTransmittedFrameCount;
ULONGLONG FailedCount; unsigned long long FailedCount;
ULONGLONG RetryCount; unsigned long long RetryCount;
ULONGLONG MultipleRetryCount; unsigned long long MultipleRetryCount;
ULONGLONG RTSSuccessCount; unsigned long long RTSSuccessCount;
ULONGLONG RTSFailureCount; unsigned long long RTSFailureCount;
ULONGLONG ACKFailureCount; unsigned long long ACKFailureCount;
ULONGLONG FrameDuplicateCount; unsigned long long FrameDuplicateCount;
ULONGLONG ReceivedFragmentCount; unsigned long long ReceivedFragmentCount;
ULONGLONG MulticastReceivedFrameCount; unsigned long long MulticastReceivedFrameCount;
ULONGLONG FCSErrorCount; unsigned long long FCSErrorCount;
ULONGLONG TKIPLocalMICFailures; unsigned long long TKIPLocalMICFailures;
ULONGLONG TKIPRemoteMICFailures; unsigned long long TKIPRemoteMICFailures;
ULONGLONG TKIPICVErrors; unsigned long long TKIPICVErrors;
ULONGLONG TKIPCounterMeasuresInvoked; unsigned long long TKIPCounterMeasuresInvoked;
ULONGLONG TKIPReplays; unsigned long long TKIPReplays;
ULONGLONG CCMPFormatErrors; unsigned long long CCMPFormatErrors;
ULONGLONG CCMPReplays; unsigned long long CCMPReplays;
ULONGLONG CCMPDecryptErrors; unsigned long long CCMPDecryptErrors;
ULONGLONG FourWayHandshakeFailures; unsigned long long FourWayHandshakeFailures;
// ULONGLONG WEPUndecryptableCount; // unsigned long long WEPUndecryptableCount;
// ULONGLONG WEPICVErrorCount; // unsigned long long WEPICVErrorCount;
// ULONGLONG DecryptSuccessCount; // unsigned long long DecryptSuccessCount;
// ULONGLONG DecryptFailureCount; // unsigned long long DecryptFailureCount;
} SDot11Counters, *PSDot11Counters; } SDot11Counters, *PSDot11Counters;
...@@ -140,35 +140,35 @@ typedef struct tagSRmonCounter { ...@@ -140,35 +140,35 @@ typedef struct tagSRmonCounter {
typedef struct tagSCustomCounters { typedef struct tagSCustomCounters {
unsigned long Length; unsigned long Length;
ULONGLONG ullTsrAllOK; unsigned long long ullTsrAllOK;
ULONGLONG ullRsr11M; unsigned long long ullRsr11M;
ULONGLONG ullRsr5M; unsigned long long ullRsr5M;
ULONGLONG ullRsr2M; unsigned long long ullRsr2M;
ULONGLONG ullRsr1M; unsigned long long ullRsr1M;
ULONGLONG ullRsr11MCRCOk; unsigned long long ullRsr11MCRCOk;
ULONGLONG ullRsr5MCRCOk; unsigned long long ullRsr5MCRCOk;
ULONGLONG ullRsr2MCRCOk; unsigned long long ullRsr2MCRCOk;
ULONGLONG ullRsr1MCRCOk; unsigned long long ullRsr1MCRCOk;
ULONGLONG ullRsr54M; unsigned long long ullRsr54M;
ULONGLONG ullRsr48M; unsigned long long ullRsr48M;
ULONGLONG ullRsr36M; unsigned long long ullRsr36M;
ULONGLONG ullRsr24M; unsigned long long ullRsr24M;
ULONGLONG ullRsr18M; unsigned long long ullRsr18M;
ULONGLONG ullRsr12M; unsigned long long ullRsr12M;
ULONGLONG ullRsr9M; unsigned long long ullRsr9M;
ULONGLONG ullRsr6M; unsigned long long ullRsr6M;
ULONGLONG ullRsr54MCRCOk; unsigned long long ullRsr54MCRCOk;
ULONGLONG ullRsr48MCRCOk; unsigned long long ullRsr48MCRCOk;
ULONGLONG ullRsr36MCRCOk; unsigned long long ullRsr36MCRCOk;
ULONGLONG ullRsr24MCRCOk; unsigned long long ullRsr24MCRCOk;
ULONGLONG ullRsr18MCRCOk; unsigned long long ullRsr18MCRCOk;
ULONGLONG ullRsr12MCRCOk; unsigned long long ullRsr12MCRCOk;
ULONGLONG ullRsr9MCRCOk; unsigned long long ullRsr9MCRCOk;
ULONGLONG ullRsr6MCRCOk; unsigned long long ullRsr6MCRCOk;
} SCustomCounters, *PSCustomCounters; } SCustomCounters, *PSCustomCounters;
...@@ -251,15 +251,15 @@ typedef struct tagSStatCounter { ...@@ -251,15 +251,15 @@ typedef struct tagSStatCounter {
DWORD dwRsrMulticast; DWORD dwRsrMulticast;
DWORD dwRsrDirected; DWORD dwRsrDirected;
// 64-bit OID // 64-bit OID
ULONGLONG ullRsrOK; unsigned long long ullRsrOK;
// for some optional OIDs (64 bits) and DMI support // for some optional OIDs (64 bits) and DMI support
ULONGLONG ullRxBroadcastBytes; unsigned long long ullRxBroadcastBytes;
ULONGLONG ullRxMulticastBytes; unsigned long long ullRxMulticastBytes;
ULONGLONG ullRxDirectedBytes; unsigned long long ullRxDirectedBytes;
ULONGLONG ullRxBroadcastFrames; unsigned long long ullRxBroadcastFrames;
ULONGLONG ullRxMulticastFrames; unsigned long long ullRxMulticastFrames;
ULONGLONG ullRxDirectedFrames; unsigned long long ullRxDirectedFrames;
DWORD dwRsrRxFragment; DWORD dwRsrRxFragment;
DWORD dwRsrRxFrmLen64; DWORD dwRsrRxFrmLen64;
...@@ -304,15 +304,15 @@ typedef struct tagSStatCounter { ...@@ -304,15 +304,15 @@ typedef struct tagSStatCounter {
unsigned int idxRxErrorDesc[TYPE_MAXRD]; // index for rx data error RD unsigned int idxRxErrorDesc[TYPE_MAXRD]; // index for rx data error RD
// 64-bit OID // 64-bit OID
ULONGLONG ullTsrOK[TYPE_MAXTD]; unsigned long long ullTsrOK[TYPE_MAXTD];
// for some optional OIDs (64 bits) and DMI support // for some optional OIDs (64 bits) and DMI support
ULONGLONG ullTxBroadcastFrames[TYPE_MAXTD]; unsigned long long ullTxBroadcastFrames[TYPE_MAXTD];
ULONGLONG ullTxMulticastFrames[TYPE_MAXTD]; unsigned long long ullTxMulticastFrames[TYPE_MAXTD];
ULONGLONG ullTxDirectedFrames[TYPE_MAXTD]; unsigned long long ullTxDirectedFrames[TYPE_MAXTD];
ULONGLONG ullTxBroadcastBytes[TYPE_MAXTD]; unsigned long long ullTxBroadcastBytes[TYPE_MAXTD];
ULONGLONG ullTxMulticastBytes[TYPE_MAXTD]; unsigned long long ullTxMulticastBytes[TYPE_MAXTD];
ULONGLONG ullTxDirectedBytes[TYPE_MAXTD]; unsigned long long ullTxDirectedBytes[TYPE_MAXTD];
// DWORD dwTxRetryCount[8]; // DWORD dwTxRetryCount[8];
// //
......
drivers/staging/vt6655/ttype.h
View file @ b2e876b6
...@@ -68,10 +68,6 @@ typedef int BOOL; ...@@ -68,10 +68,6 @@ typedef int BOOL;
* but it doesn't matter if they're signed or unsigned. * but it doesn't matter if they're signed or unsigned.
*/ */
typedef unsigned long long ULONGLONG; //64 bit
typedef unsigned char BYTE; // 8-bit typedef unsigned char BYTE; // 8-bit
typedef unsigned short WORD; // 16-bit typedef unsigned short WORD; // 16-bit
typedef unsigned long DWORD; // 32-bit typedef unsigned long DWORD; // 32-bit
......
drivers/staging/vt6655/wpactl.h
View file @ b2e876b6
...@@ -54,7 +54,7 @@ typedef enum { KEY_MGMT_802_1X, KEY_MGMT_CCKM,KEY_MGMT_PSK, KEY_MGMT_NONE, ...@@ -54,7 +54,7 @@ typedef enum { KEY_MGMT_802_1X, KEY_MGMT_CCKM,KEY_MGMT_PSK, KEY_MGMT_NONE,
typedef ULONGLONG NDIS_802_11_KEY_RSC; typedef unsigned long long NDIS_802_11_KEY_RSC;
/*--------------------- Export Classes ----------------------------*/ /*--------------------- Export Classes ----------------------------*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7