提交 fd0badb8 编写于 作者: J Joe Perches 提交者: Greg Kroah-Hartman

staging:vt6655:mib: Whitespace cleanups

Neatening only.
git diff -w shows no differences.
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 c3504bfd
此差异已折叠。
...@@ -39,28 +39,28 @@ ...@@ -39,28 +39,28 @@
// //
typedef struct tagSDot11Counters { typedef struct tagSDot11Counters {
unsigned long Length; // Length of structure unsigned long Length; // Length of structure
unsigned long long TransmittedFragmentCount; unsigned long long TransmittedFragmentCount;
unsigned long long MulticastTransmittedFrameCount; unsigned long long MulticastTransmittedFrameCount;
unsigned long long FailedCount; unsigned long long FailedCount;
unsigned long long RetryCount; unsigned long long RetryCount;
unsigned long long MultipleRetryCount; unsigned long long MultipleRetryCount;
unsigned long long RTSSuccessCount; unsigned long long RTSSuccessCount;
unsigned long long RTSFailureCount; unsigned long long RTSFailureCount;
unsigned long long ACKFailureCount; unsigned long long ACKFailureCount;
unsigned long long FrameDuplicateCount; unsigned long long FrameDuplicateCount;
unsigned long long ReceivedFragmentCount; unsigned long long ReceivedFragmentCount;
unsigned long long MulticastReceivedFrameCount; unsigned long long MulticastReceivedFrameCount;
unsigned long long FCSErrorCount; unsigned long long FCSErrorCount;
unsigned long long TKIPLocalMICFailures; unsigned long long TKIPLocalMICFailures;
unsigned long long TKIPRemoteMICFailures; unsigned long long TKIPRemoteMICFailures;
unsigned long long TKIPICVErrors; unsigned long long TKIPICVErrors;
unsigned long long TKIPCounterMeasuresInvoked; unsigned long long TKIPCounterMeasuresInvoked;
unsigned long long TKIPReplays; unsigned long long TKIPReplays;
unsigned long long CCMPFormatErrors; unsigned long long CCMPFormatErrors;
unsigned long long CCMPReplays; unsigned long long CCMPReplays;
unsigned long long CCMPDecryptErrors; unsigned long long CCMPDecryptErrors;
unsigned long long FourWayHandshakeFailures; unsigned long long FourWayHandshakeFailures;
// unsigned long long WEPUndecryptableCount; // unsigned long long WEPUndecryptableCount;
// unsigned long long WEPICVErrorCount; // unsigned long long WEPICVErrorCount;
// unsigned long long DecryptSuccessCount; // unsigned long long DecryptSuccessCount;
...@@ -72,29 +72,29 @@ typedef struct tagSDot11Counters { ...@@ -72,29 +72,29 @@ typedef struct tagSDot11Counters {
// MIB2 counter // MIB2 counter
// //
typedef struct tagSMib2Counter { typedef struct tagSMib2Counter {
long ifIndex; long ifIndex;
char ifDescr[256]; // max size 255 plus zero ending char ifDescr[256]; // max size 255 plus zero ending
// e.g. "interface 1" // e.g. "interface 1"
long ifType; long ifType;
long ifMtu; long ifMtu;
unsigned long ifSpeed; unsigned long ifSpeed;
unsigned char ifPhysAddress[ETH_ALEN]; unsigned char ifPhysAddress[ETH_ALEN];
long ifAdminStatus; long ifAdminStatus;
long ifOperStatus; long ifOperStatus;
unsigned long ifLastChange; unsigned long ifLastChange;
unsigned long ifInOctets; unsigned long ifInOctets;
unsigned long ifInUcastPkts; unsigned long ifInUcastPkts;
unsigned long ifInNUcastPkts; unsigned long ifInNUcastPkts;
unsigned long ifInDiscards; unsigned long ifInDiscards;
unsigned long ifInErrors; unsigned long ifInErrors;
unsigned long ifInUnknownProtos; unsigned long ifInUnknownProtos;
unsigned long ifOutOctets; unsigned long ifOutOctets;
unsigned long ifOutUcastPkts; unsigned long ifOutUcastPkts;
unsigned long ifOutNUcastPkts; unsigned long ifOutNUcastPkts;
unsigned long ifOutDiscards; unsigned long ifOutDiscards;
unsigned long ifOutErrors; unsigned long ifOutErrors;
unsigned long ifOutQLen; unsigned long ifOutQLen;
unsigned long ifSpecific; unsigned long ifSpecific;
} SMib2Counter, *PSMib2Counter; } SMib2Counter, *PSMib2Counter;
// Value in the ifType entry // Value in the ifType entry
...@@ -110,64 +110,64 @@ typedef struct tagSMib2Counter { ...@@ -110,64 +110,64 @@ typedef struct tagSMib2Counter {
// RMON counter // RMON counter
// //
typedef struct tagSRmonCounter { typedef struct tagSRmonCounter {
long etherStatsIndex; long etherStatsIndex;
unsigned long etherStatsDataSource; unsigned long etherStatsDataSource;
unsigned long etherStatsDropEvents; unsigned long etherStatsDropEvents;
unsigned long etherStatsOctets; unsigned long etherStatsOctets;
unsigned long etherStatsPkts; unsigned long etherStatsPkts;
unsigned long etherStatsBroadcastPkts; unsigned long etherStatsBroadcastPkts;
unsigned long etherStatsMulticastPkts; unsigned long etherStatsMulticastPkts;
unsigned long etherStatsCRCAlignErrors; unsigned long etherStatsCRCAlignErrors;
unsigned long etherStatsUndersizePkts; unsigned long etherStatsUndersizePkts;
unsigned long etherStatsOversizePkts; unsigned long etherStatsOversizePkts;
unsigned long etherStatsFragments; unsigned long etherStatsFragments;
unsigned long etherStatsJabbers; unsigned long etherStatsJabbers;
unsigned long etherStatsCollisions; unsigned long etherStatsCollisions;
unsigned long etherStatsPkt64Octets; unsigned long etherStatsPkt64Octets;
unsigned long etherStatsPkt65to127Octets; unsigned long etherStatsPkt65to127Octets;
unsigned long etherStatsPkt128to255Octets; unsigned long etherStatsPkt128to255Octets;
unsigned long etherStatsPkt256to511Octets; unsigned long etherStatsPkt256to511Octets;
unsigned long etherStatsPkt512to1023Octets; unsigned long etherStatsPkt512to1023Octets;
unsigned long etherStatsPkt1024to1518Octets; unsigned long etherStatsPkt1024to1518Octets;
unsigned long etherStatsOwners; unsigned long etherStatsOwners;
unsigned long etherStatsStatus; unsigned long etherStatsStatus;
} SRmonCounter, *PSRmonCounter; } SRmonCounter, *PSRmonCounter;
// //
// Custom counter // Custom counter
// //
typedef struct tagSCustomCounters { typedef struct tagSCustomCounters {
unsigned long Length; unsigned long Length;
unsigned long long ullTsrAllOK; unsigned long long ullTsrAllOK;
unsigned long long ullRsr11M; unsigned long long ullRsr11M;
unsigned long long ullRsr5M; unsigned long long ullRsr5M;
unsigned long long ullRsr2M; unsigned long long ullRsr2M;
unsigned long long ullRsr1M; unsigned long long ullRsr1M;
unsigned long long ullRsr11MCRCOk; unsigned long long ullRsr11MCRCOk;
unsigned long long ullRsr5MCRCOk; unsigned long long ullRsr5MCRCOk;
unsigned long long ullRsr2MCRCOk; unsigned long long ullRsr2MCRCOk;
unsigned long long ullRsr1MCRCOk; unsigned long long ullRsr1MCRCOk;
unsigned long long ullRsr54M; unsigned long long ullRsr54M;
unsigned long long ullRsr48M; unsigned long long ullRsr48M;
unsigned long long ullRsr36M; unsigned long long ullRsr36M;
unsigned long long ullRsr24M; unsigned long long ullRsr24M;
unsigned long long ullRsr18M; unsigned long long ullRsr18M;
unsigned long long ullRsr12M; unsigned long long ullRsr12M;
unsigned long long ullRsr9M; unsigned long long ullRsr9M;
unsigned long long ullRsr6M; unsigned long long ullRsr6M;
unsigned long long ullRsr54MCRCOk; unsigned long long ullRsr54MCRCOk;
unsigned long long ullRsr48MCRCOk; unsigned long long ullRsr48MCRCOk;
unsigned long long ullRsr36MCRCOk; unsigned long long ullRsr36MCRCOk;
unsigned long long ullRsr24MCRCOk; unsigned long long ullRsr24MCRCOk;
unsigned long long ullRsr18MCRCOk; unsigned long long ullRsr18MCRCOk;
unsigned long long ullRsr12MCRCOk; unsigned long long ullRsr12MCRCOk;
unsigned long long ullRsr9MCRCOk; unsigned long long ullRsr9MCRCOk;
unsigned long long ullRsr6MCRCOk; unsigned long long ullRsr6MCRCOk;
} SCustomCounters, *PSCustomCounters; } SCustomCounters, *PSCustomCounters;
...@@ -176,30 +176,30 @@ typedef struct tagSCustomCounters { ...@@ -176,30 +176,30 @@ typedef struct tagSCustomCounters {
// Custom counter // Custom counter
// //
typedef struct tagSISRCounters { typedef struct tagSISRCounters {
unsigned long Length; unsigned long Length;
unsigned long dwIsrTx0OK; unsigned long dwIsrTx0OK;
unsigned long dwIsrAC0TxOK; unsigned long dwIsrAC0TxOK;
unsigned long dwIsrBeaconTxOK; unsigned long dwIsrBeaconTxOK;
unsigned long dwIsrRx0OK; unsigned long dwIsrRx0OK;
unsigned long dwIsrTBTTInt; unsigned long dwIsrTBTTInt;
unsigned long dwIsrSTIMERInt; unsigned long dwIsrSTIMERInt;
unsigned long dwIsrWatchDog; unsigned long dwIsrWatchDog;
unsigned long dwIsrUnrecoverableError; unsigned long dwIsrUnrecoverableError;
unsigned long dwIsrSoftInterrupt; unsigned long dwIsrSoftInterrupt;
unsigned long dwIsrMIBNearfull; unsigned long dwIsrMIBNearfull;
unsigned long dwIsrRxNoBuf; unsigned long dwIsrRxNoBuf;
unsigned long dwIsrUnknown; // unknown interrupt count unsigned long dwIsrUnknown; // unknown interrupt count
unsigned long dwIsrRx1OK; unsigned long dwIsrRx1OK;
unsigned long dwIsrATIMTxOK; unsigned long dwIsrATIMTxOK;
unsigned long dwIsrSYNCTxOK; unsigned long dwIsrSYNCTxOK;
unsigned long dwIsrCFPEnd; unsigned long dwIsrCFPEnd;
unsigned long dwIsrATIMEnd; unsigned long dwIsrATIMEnd;
unsigned long dwIsrSYNCFlushOK; unsigned long dwIsrSYNCFlushOK;
unsigned long dwIsrSTIMER1Int; unsigned long dwIsrSTIMER1Int;
///////////////////////////////////// /////////////////////////////////////
} SISRCounters, *PSISRCounters; } SISRCounters, *PSISRCounters;
...@@ -213,125 +213,125 @@ typedef struct tagSISRCounters { ...@@ -213,125 +213,125 @@ typedef struct tagSISRCounters {
// statistic counter // statistic counter
// //
typedef struct tagSStatCounter { typedef struct tagSStatCounter {
// //
// ISR status count // ISR status count
// //
// RSR status count // RSR status count
// //
unsigned long dwRsrFrmAlgnErr; unsigned long dwRsrFrmAlgnErr;
unsigned long dwRsrErr; unsigned long dwRsrErr;
unsigned long dwRsrCRCErr; unsigned long dwRsrCRCErr;
unsigned long dwRsrCRCOk; unsigned long dwRsrCRCOk;
unsigned long dwRsrBSSIDOk; unsigned long dwRsrBSSIDOk;
unsigned long dwRsrADDROk; unsigned long dwRsrADDROk;
unsigned long dwRsrBCNSSIDOk; unsigned long dwRsrBCNSSIDOk;
unsigned long dwRsrLENErr; unsigned long dwRsrLENErr;
unsigned long dwRsrTYPErr; unsigned long dwRsrTYPErr;
unsigned long dwNewRsrDECRYPTOK; unsigned long dwNewRsrDECRYPTOK;
unsigned long dwNewRsrCFP; unsigned long dwNewRsrCFP;
unsigned long dwNewRsrUTSF; unsigned long dwNewRsrUTSF;
unsigned long dwNewRsrHITAID; unsigned long dwNewRsrHITAID;
unsigned long dwNewRsrHITAID0; unsigned long dwNewRsrHITAID0;
unsigned long dwRsrLong; unsigned long dwRsrLong;
unsigned long dwRsrRunt; unsigned long dwRsrRunt;
unsigned long dwRsrRxControl; unsigned long dwRsrRxControl;
unsigned long dwRsrRxData; unsigned long dwRsrRxData;
unsigned long dwRsrRxManage; unsigned long dwRsrRxManage;
unsigned long dwRsrRxPacket; unsigned long dwRsrRxPacket;
unsigned long dwRsrRxOctet; unsigned long dwRsrRxOctet;
unsigned long dwRsrBroadcast; unsigned long dwRsrBroadcast;
unsigned long dwRsrMulticast; unsigned long dwRsrMulticast;
unsigned long dwRsrDirected; unsigned long dwRsrDirected;
// 64-bit OID // 64-bit OID
unsigned long long ullRsrOK; unsigned long long ullRsrOK;
// for some optional OIDs (64 bits) and DMI support // for some optional OIDs (64 bits) and DMI support
unsigned long long ullRxBroadcastBytes; unsigned long long ullRxBroadcastBytes;
unsigned long long ullRxMulticastBytes; unsigned long long ullRxMulticastBytes;
unsigned long long ullRxDirectedBytes; unsigned long long ullRxDirectedBytes;
unsigned long long ullRxBroadcastFrames; unsigned long long ullRxBroadcastFrames;
unsigned long long ullRxMulticastFrames; unsigned long long ullRxMulticastFrames;
unsigned long long ullRxDirectedFrames; unsigned long long ullRxDirectedFrames;
unsigned long dwRsrRxFragment; unsigned long dwRsrRxFragment;
unsigned long dwRsrRxFrmLen64; unsigned long dwRsrRxFrmLen64;
unsigned long dwRsrRxFrmLen65_127; unsigned long dwRsrRxFrmLen65_127;
unsigned long dwRsrRxFrmLen128_255; unsigned long dwRsrRxFrmLen128_255;
unsigned long dwRsrRxFrmLen256_511; unsigned long dwRsrRxFrmLen256_511;
unsigned long dwRsrRxFrmLen512_1023; unsigned long dwRsrRxFrmLen512_1023;
unsigned long dwRsrRxFrmLen1024_1518; unsigned long dwRsrRxFrmLen1024_1518;
// TSR status count // TSR status count
// //
unsigned long dwTsrTotalRetry[TYPE_MAXTD]; // total collision retry count unsigned long dwTsrTotalRetry[TYPE_MAXTD]; // total collision retry count
unsigned long dwTsrOnceRetry[TYPE_MAXTD]; // this packet only occur one collision unsigned long dwTsrOnceRetry[TYPE_MAXTD]; // this packet only occur one collision
unsigned long dwTsrMoreThanOnceRetry[TYPE_MAXTD]; // this packet occur more than one collision unsigned long dwTsrMoreThanOnceRetry[TYPE_MAXTD]; // this packet occur more than one collision
unsigned long dwTsrRetry[TYPE_MAXTD]; // this packet has ever occur collision, unsigned long dwTsrRetry[TYPE_MAXTD]; // this packet has ever occur collision,
// that is (dwTsrOnceCollision0 + dwTsrMoreThanOnceCollision0) // that is (dwTsrOnceCollision0 + dwTsrMoreThanOnceCollision0)
unsigned long dwTsrACKData[TYPE_MAXTD]; unsigned long dwTsrACKData[TYPE_MAXTD];
unsigned long dwTsrErr[TYPE_MAXTD]; unsigned long dwTsrErr[TYPE_MAXTD];
unsigned long dwAllTsrOK[TYPE_MAXTD]; unsigned long dwAllTsrOK[TYPE_MAXTD];
unsigned long dwTsrRetryTimeout[TYPE_MAXTD]; unsigned long dwTsrRetryTimeout[TYPE_MAXTD];
unsigned long dwTsrTransmitTimeout[TYPE_MAXTD]; unsigned long dwTsrTransmitTimeout[TYPE_MAXTD];
unsigned long dwTsrTxPacket[TYPE_MAXTD]; unsigned long dwTsrTxPacket[TYPE_MAXTD];
unsigned long dwTsrTxOctet[TYPE_MAXTD]; unsigned long dwTsrTxOctet[TYPE_MAXTD];
unsigned long dwTsrBroadcast[TYPE_MAXTD]; unsigned long dwTsrBroadcast[TYPE_MAXTD];
unsigned long dwTsrMulticast[TYPE_MAXTD]; unsigned long dwTsrMulticast[TYPE_MAXTD];
unsigned long dwTsrDirected[TYPE_MAXTD]; unsigned long dwTsrDirected[TYPE_MAXTD];
// RD/TD count // RD/TD count
unsigned long dwCntRxFrmLength; unsigned long dwCntRxFrmLength;
unsigned long dwCntTxBufLength; unsigned long dwCntTxBufLength;
unsigned char abyCntRxPattern[16]; unsigned char abyCntRxPattern[16];
unsigned char abyCntTxPattern[16]; unsigned char abyCntTxPattern[16];
// Software check.... // Software check....
unsigned long dwCntRxDataErr; // rx buffer data software compare CRC err count unsigned long dwCntRxDataErr; // rx buffer data software compare CRC err count
unsigned long dwCntDecryptErr; // rx buffer data software compare CRC err count unsigned long dwCntDecryptErr; // rx buffer data software compare CRC err count
unsigned long dwCntRxICVErr; // rx buffer data software compare CRC err count unsigned long dwCntRxICVErr; // rx buffer data software compare CRC err count
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
unsigned long long 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
unsigned long long ullTxBroadcastFrames[TYPE_MAXTD]; unsigned long long ullTxBroadcastFrames[TYPE_MAXTD];
unsigned long long ullTxMulticastFrames[TYPE_MAXTD]; unsigned long long ullTxMulticastFrames[TYPE_MAXTD];
unsigned long long ullTxDirectedFrames[TYPE_MAXTD]; unsigned long long ullTxDirectedFrames[TYPE_MAXTD];
unsigned long long ullTxBroadcastBytes[TYPE_MAXTD]; unsigned long long ullTxBroadcastBytes[TYPE_MAXTD];
unsigned long long ullTxMulticastBytes[TYPE_MAXTD]; unsigned long long ullTxMulticastBytes[TYPE_MAXTD];
unsigned long long ullTxDirectedBytes[TYPE_MAXTD]; unsigned long long ullTxDirectedBytes[TYPE_MAXTD];
// unsigned long dwTxRetryCount[8]; // unsigned long dwTxRetryCount[8];
// //
// ISR status count // ISR status count
// //
SISRCounters ISRStat; SISRCounters ISRStat;
SCustomCounters CustomStat; SCustomCounters CustomStat;
#ifdef Calcu_LinkQual #ifdef Calcu_LinkQual
//Tx count: //Tx count:
unsigned long TxNoRetryOkCount; //success tx no retry ! unsigned long TxNoRetryOkCount; //success tx no retry !
unsigned long TxRetryOkCount; //success tx but retry ! unsigned long TxRetryOkCount; //success tx but retry !
unsigned long TxFailCount; //fail tx ? unsigned long TxFailCount; //fail tx ?
//Rx count: //Rx count:
unsigned long RxOkCnt; //success rx ! unsigned long RxOkCnt; //success rx !
unsigned long RxFcsErrCnt; //fail rx ? unsigned long RxFcsErrCnt; //fail rx ?
//statistic //statistic
unsigned long SignalStren; unsigned long SignalStren;
unsigned long LinkQuality; unsigned long LinkQuality;
#endif #endif
} SStatCounter, *PSStatCounter; } SStatCounter, *PSStatCounter;
/*--------------------- Export Classes ----------------------------*/ /*--------------------- Export Classes ----------------------------*/
...@@ -345,27 +345,27 @@ void STAvClearAllCounter(PSStatCounter pStatistic); ...@@ -345,27 +345,27 @@ void STAvClearAllCounter(PSStatCounter pStatistic);
void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr); void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, unsigned long dwIsr);
void STAvUpdateRDStatCounter(PSStatCounter pStatistic, void STAvUpdateRDStatCounter(PSStatCounter pStatistic,
unsigned char byRSR, unsigned char byNewRSR, unsigned char byRxRate, unsigned char byRSR, unsigned char byNewRSR, unsigned char byRxRate,
unsigned char *pbyBuffer, unsigned int cbFrameLength); unsigned char *pbyBuffer, unsigned int cbFrameLength);
void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic, void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic,
unsigned char byRSR, unsigned char byNewRsr, unsigned char byRxRate, unsigned char byRSR, unsigned char byNewRsr, unsigned char byRxRate,
unsigned char *pbyBuffer, unsigned int cbFrameLength); unsigned char *pbyBuffer, unsigned int cbFrameLength);
void STAvUpdateTDStatCounter(PSStatCounter pStatistic, unsigned char byTSR0, unsigned char byTSR1, void STAvUpdateTDStatCounter(PSStatCounter pStatistic, unsigned char byTSR0, unsigned char byTSR1,
unsigned char *pbyBuffer, unsigned int cbFrameLength, unsigned int uIdx); unsigned char *pbyBuffer, unsigned int cbFrameLength, unsigned int uIdx);
void STAvUpdateTDStatCounterEx( void STAvUpdateTDStatCounterEx(
PSStatCounter pStatistic, PSStatCounter pStatistic,
unsigned char *pbyBuffer, unsigned char *pbyBuffer,
unsigned long cbFrameLength unsigned long cbFrameLength
); );
void STAvUpdate802_11Counter( void STAvUpdate802_11Counter(
PSDot11Counters p802_11Counter, PSDot11Counters p802_11Counter,
PSStatCounter pStatistic, PSStatCounter pStatistic,
unsigned long dwCounter unsigned long dwCounter
); );
void STAvClear802_11Counter(PSDot11Counters p802_11Counter); void STAvClear802_11Counter(PSDot11Counters p802_11Counter);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册