Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/vt6655/bssdb.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ typedef struct tagKnownNodeDB { 
    WORD            wEnQueueCnt;



    BOOL            bOnFly;

    ULONGLONG       KeyRSC;

    unsigned long long       KeyRSC;

    BYTE            byKeyIndex;

    DWORD           dwKeyIndex;

    BYTE            byCipherSuite;

drivers/staging/vt6655/dpc.c

+2 −2
Original line number Diff line number Diff line
@@ -919,9 +919,9 @@ device_receive_frame ( 
        if (bIsWEP) {

            WORD        wLocalTSC15_0 = 0;

            DWORD       dwLocalTSC47_16 = 0;

            ULONGLONG       RSC = 0;

            unsigned long long       RSC = 0;

            // endian issues

            RSC = *((ULONGLONG *) &(pKey->KeyRSC));

            RSC = *((unsigned long long *) &(pKey->KeyRSC));

            wLocalTSC15_0 = (WORD) RSC;

            dwLocalTSC47_16 = (DWORD) (RSC>>16);

drivers/staging/vt6655/mib.c

+15 −15
Original line number Diff line number Diff line
@@ -194,15 +194,15 @@ void STAvUpdateRDStatCounter (PSStatCounter pStatistic, 
            // update counters in case that successful transmit

            if (byRSR & RSR_ADDRBROAD) {

                pStatistic->ullRxBroadcastFrames++;

                pStatistic->ullRxBroadcastBytes += (ULONGLONG)cbFrameLength;

                pStatistic->ullRxBroadcastBytes += (unsigned long long) cbFrameLength;

            }

            else if (byRSR & RSR_ADDRMULTI) {

                pStatistic->ullRxMulticastFrames++;

                pStatistic->ullRxMulticastBytes += (ULONGLONG)cbFrameLength;

                pStatistic->ullRxMulticastBytes += (unsigned long long) cbFrameLength;

            }

            else {

                pStatistic->ullRxDirectedFrames++;

                pStatistic->ullRxDirectedBytes += (ULONGLONG)cbFrameLength;

                pStatistic->ullRxDirectedBytes += (unsigned long long) cbFrameLength;

            }

        }

    }
@@ -473,15 +473,15 @@ STAvUpdateTDStatCounter ( 
        // update counters in case that successful transmit

        if (is_broadcast_ether_addr(pbyDestAddr)) {

            pStatistic->ullTxBroadcastFrames[uIdx]++;

            pStatistic->ullTxBroadcastBytes[uIdx] += (ULONGLONG)cbFrameLength;

            pStatistic->ullTxBroadcastBytes[uIdx] += (unsigned long long) cbFrameLength;

        }

        else if (is_multicast_ether_addr(pbyDestAddr)) {

            pStatistic->ullTxMulticastFrames[uIdx]++;

            pStatistic->ullTxMulticastBytes[uIdx] += (ULONGLONG)cbFrameLength;

            pStatistic->ullTxMulticastBytes[uIdx] += (unsigned long long) cbFrameLength;

        }

        else {

            pStatistic->ullTxDirectedFrames[uIdx]++;

            pStatistic->ullTxDirectedBytes[uIdx] += (ULONGLONG)cbFrameLength;

            pStatistic->ullTxDirectedBytes[uIdx] += (unsigned long long) cbFrameLength;

        }

    }

    else {
@@ -559,21 +559,21 @@ STAvUpdate802_11Counter( 
    )

{

    //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->dwTsrMulticast[TYPE_AC0DMA] +

                                                                  pStatistic->dwTsrMulticast[TYPE_TXDMA0]);

    p802_11Counter->FailedCount = (ULONGLONG) (pStatistic->dwTsrErr[TYPE_AC0DMA] + pStatistic->dwTsrErr[TYPE_TXDMA0]);

    p802_11Counter->RetryCount = (ULONGLONG) (pStatistic->dwTsrRetry[TYPE_AC0DMA] + pStatistic->dwTsrRetry[TYPE_TXDMA0]);

    p802_11Counter->MultipleRetryCount = (ULONGLONG) (pStatistic->dwTsrMoreThanOnceRetry[TYPE_AC0DMA] +

    p802_11Counter->FailedCount = (unsigned long long) (pStatistic->dwTsrErr[TYPE_AC0DMA] + pStatistic->dwTsrErr[TYPE_TXDMA0]);

    p802_11Counter->RetryCount = (unsigned long long) (pStatistic->dwTsrRetry[TYPE_AC0DMA] + pStatistic->dwTsrRetry[TYPE_TXDMA0]);

    p802_11Counter->MultipleRetryCount = (unsigned long long) (pStatistic->dwTsrMoreThanOnceRetry[TYPE_AC0DMA] +

                                                          pStatistic->dwTsrMoreThanOnceRetry[TYPE_TXDMA0]);

    //p802_11Counter->FrameDuplicateCount

    p802_11Counter->RTSSuccessCount += (ULONGLONG)  (dwCounter & 0x000000ff);

    p802_11Counter->RTSFailureCount += (ULONGLONG) ((dwCounter & 0x0000ff00) >> 8);

    p802_11Counter->ACKFailureCount += (ULONGLONG) ((dwCounter & 0x00ff0000) >> 16);

    p802_11Counter->FCSErrorCount +=   (ULONGLONG) ((dwCounter & 0xff000000) >> 24);

    p802_11Counter->RTSSuccessCount += (unsigned long long)  (dwCounter & 0x000000ff);

    p802_11Counter->RTSFailureCount += (unsigned long long) ((dwCounter & 0x0000ff00) >> 8);

    p802_11Counter->ACKFailureCount += (unsigned long long) ((dwCounter & 0x00ff0000) >> 16);

    p802_11Counter->FCSErrorCount +=   (unsigned long long) ((dwCounter & 0xff000000) >> 24);

    //p802_11Counter->ReceivedFragmentCount

    p802_11Counter->MulticastReceivedFrameCount = (ULONGLONG) (pStatistic->dwRsrBroadcast +

    p802_11Counter->MulticastReceivedFrameCount = (unsigned long long) (pStatistic->dwRsrBroadcast +

                                                               pStatistic->dwRsrMulticast);

}

drivers/staging/vt6655/mib.h

+68 −68
Original line number Diff line number Diff line
@@ -40,31 +40,31 @@ 


typedef struct tagSDot11Counters {

    unsigned long Length;             // Length of structure

    ULONGLONG   TransmittedFragmentCount;

    ULONGLONG   MulticastTransmittedFrameCount;

    ULONGLONG   FailedCount;

    ULONGLONG   RetryCount;

    ULONGLONG   MultipleRetryCount;

    ULONGLONG   RTSSuccessCount;

    ULONGLONG   RTSFailureCount;

    ULONGLONG   ACKFailureCount;

    ULONGLONG   FrameDuplicateCount;

    ULONGLONG   ReceivedFragmentCount;

    ULONGLONG   MulticastReceivedFrameCount;

    ULONGLONG   FCSErrorCount;

    ULONGLONG   TKIPLocalMICFailures;

    ULONGLONG   TKIPRemoteMICFailures;

    ULONGLONG   TKIPICVErrors;

    ULONGLONG   TKIPCounterMeasuresInvoked;

    ULONGLONG   TKIPReplays;

    ULONGLONG   CCMPFormatErrors;

    ULONGLONG   CCMPReplays;

    ULONGLONG   CCMPDecryptErrors;

    ULONGLONG   FourWayHandshakeFailures;

//    ULONGLONG   WEPUndecryptableCount;

//    ULONGLONG   WEPICVErrorCount;

//    ULONGLONG   DecryptSuccessCount;

//    ULONGLONG   DecryptFailureCount;

    unsigned long long   TransmittedFragmentCount;

    unsigned long long   MulticastTransmittedFrameCount;

    unsigned long long   FailedCount;

    unsigned long long   RetryCount;

    unsigned long long   MultipleRetryCount;

    unsigned long long   RTSSuccessCount;

    unsigned long long   RTSFailureCount;

    unsigned long long   ACKFailureCount;

    unsigned long long   FrameDuplicateCount;

    unsigned long long   ReceivedFragmentCount;

    unsigned long long   MulticastReceivedFrameCount;

    unsigned long long   FCSErrorCount;

    unsigned long long   TKIPLocalMICFailures;

    unsigned long long   TKIPRemoteMICFailures;

    unsigned long long   TKIPICVErrors;

    unsigned long long   TKIPCounterMeasuresInvoked;

    unsigned long long   TKIPReplays;

    unsigned long long   CCMPFormatErrors;

    unsigned long long   CCMPReplays;

    unsigned long long   CCMPDecryptErrors;

    unsigned long long   FourWayHandshakeFailures;

//    unsigned long long   WEPUndecryptableCount;

//    unsigned long long   WEPICVErrorCount;

//    unsigned long long   DecryptSuccessCount;

//    unsigned long long   DecryptFailureCount;

} SDot11Counters, *PSDot11Counters;
@@ -140,35 +140,35 @@ typedef struct tagSRmonCounter { 
typedef struct tagSCustomCounters {

    unsigned long Length;



    ULONGLONG   ullTsrAllOK;



    ULONGLONG   ullRsr11M;

    ULONGLONG   ullRsr5M;

    ULONGLONG   ullRsr2M;

    ULONGLONG   ullRsr1M;



    ULONGLONG   ullRsr11MCRCOk;

    ULONGLONG   ullRsr5MCRCOk;

    ULONGLONG   ullRsr2MCRCOk;

    ULONGLONG   ullRsr1MCRCOk;



    ULONGLONG   ullRsr54M;

    ULONGLONG   ullRsr48M;

    ULONGLONG   ullRsr36M;

    ULONGLONG   ullRsr24M;

    ULONGLONG   ullRsr18M;

    ULONGLONG   ullRsr12M;

    ULONGLONG   ullRsr9M;

    ULONGLONG   ullRsr6M;



    ULONGLONG   ullRsr54MCRCOk;

    ULONGLONG   ullRsr48MCRCOk;

    ULONGLONG   ullRsr36MCRCOk;

    ULONGLONG   ullRsr24MCRCOk;

    ULONGLONG   ullRsr18MCRCOk;

    ULONGLONG   ullRsr12MCRCOk;

    ULONGLONG   ullRsr9MCRCOk;

    ULONGLONG   ullRsr6MCRCOk;

    unsigned long long   ullTsrAllOK;



    unsigned long long   ullRsr11M;

    unsigned long long   ullRsr5M;

    unsigned long long   ullRsr2M;

    unsigned long long   ullRsr1M;



    unsigned long long   ullRsr11MCRCOk;

    unsigned long long   ullRsr5MCRCOk;

    unsigned long long   ullRsr2MCRCOk;

    unsigned long long   ullRsr1MCRCOk;



    unsigned long long   ullRsr54M;

    unsigned long long   ullRsr48M;

    unsigned long long   ullRsr36M;

    unsigned long long   ullRsr24M;

    unsigned long long   ullRsr18M;

    unsigned long long   ullRsr12M;

    unsigned long long   ullRsr9M;

    unsigned long long   ullRsr6M;



    unsigned long long   ullRsr54MCRCOk;

    unsigned long long   ullRsr48MCRCOk;

    unsigned long long   ullRsr36MCRCOk;

    unsigned long long   ullRsr24MCRCOk;

    unsigned long long   ullRsr18MCRCOk;

    unsigned long long   ullRsr12MCRCOk;

    unsigned long long   ullRsr9MCRCOk;

    unsigned long long   ullRsr6MCRCOk;



} SCustomCounters, *PSCustomCounters;
@@ -251,15 +251,15 @@ typedef struct tagSStatCounter { 
    DWORD   dwRsrMulticast;

    DWORD   dwRsrDirected;

    // 64-bit OID

    ULONGLONG   ullRsrOK;

    unsigned long long   ullRsrOK;



    // for some optional OIDs (64 bits) and DMI support

    ULONGLONG   ullRxBroadcastBytes;

    ULONGLONG   ullRxMulticastBytes;

    ULONGLONG   ullRxDirectedBytes;

    ULONGLONG   ullRxBroadcastFrames;

    ULONGLONG   ullRxMulticastFrames;

    ULONGLONG   ullRxDirectedFrames;

    unsigned long long   ullRxBroadcastBytes;

    unsigned long long   ullRxMulticastBytes;

    unsigned long long   ullRxDirectedBytes;

    unsigned long long   ullRxBroadcastFrames;

    unsigned long long   ullRxMulticastFrames;

    unsigned long long   ullRxDirectedFrames;



    DWORD   dwRsrRxFragment;

    DWORD   dwRsrRxFrmLen64;
@@ -304,15 +304,15 @@ typedef struct tagSStatCounter { 
    unsigned int idxRxErrorDesc[TYPE_MAXRD]; // index for rx data error RD



    // 64-bit OID

    ULONGLONG   ullTsrOK[TYPE_MAXTD];

    unsigned long long   ullTsrOK[TYPE_MAXTD];



    // for some optional OIDs (64 bits) and DMI support

    ULONGLONG   ullTxBroadcastFrames[TYPE_MAXTD];

    ULONGLONG   ullTxMulticastFrames[TYPE_MAXTD];

    ULONGLONG   ullTxDirectedFrames[TYPE_MAXTD];

    ULONGLONG   ullTxBroadcastBytes[TYPE_MAXTD];

    ULONGLONG   ullTxMulticastBytes[TYPE_MAXTD];

    ULONGLONG   ullTxDirectedBytes[TYPE_MAXTD];

    unsigned long long   ullTxBroadcastFrames[TYPE_MAXTD];

    unsigned long long   ullTxMulticastFrames[TYPE_MAXTD];

    unsigned long long   ullTxDirectedFrames[TYPE_MAXTD];

    unsigned long long   ullTxBroadcastBytes[TYPE_MAXTD];

    unsigned long long   ullTxMulticastBytes[TYPE_MAXTD];

    unsigned long long   ullTxDirectedBytes[TYPE_MAXTD];



//    DWORD   dwTxRetryCount[8];

    //

drivers/staging/vt6655/ttype.h

+0 −4
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ typedef int BOOL; 
 * 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 short  WORD;           // 16-bit

typedef unsigned long   DWORD;          // 32-bit