diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/vt6655/mib.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/mib.h')
| -rw-r--r-- | drivers/staging/vt6655/mib.h | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/drivers/staging/vt6655/mib.h b/drivers/staging/vt6655/mib.h index b4e1c4a..69e04f7 100644 --- a/drivers/staging/vt6655/mib.h +++ b/drivers/staging/vt6655/mib.h @@ -29,19 +29,9 @@ #ifndef __MIB_H__ #define __MIB_H__ -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif -#if !defined(__TETHER_H__) #include "tether.h" -#endif -#if !defined(__DESC_H__) #include "desc.h" -#endif - - - -//#define ULONGLONG ULONG /*--------------------- Export Definitions -------------------------*/ // @@ -75,7 +65,7 @@ typedef struct tagSDot11Counters { // ULONGLONG WEPICVErrorCount; // ULONGLONG DecryptSuccessCount; // ULONGLONG DecryptFailureCount; -} SDot11Counters, DEF* PSDot11Counters; +} SDot11Counters, *PSDot11Counters; // @@ -83,7 +73,7 @@ typedef struct tagSDot11Counters { // typedef struct tagSMib2Counter { LONG ifIndex; - TCHAR ifDescr[256]; // max size 255 plus zero ending + char ifDescr[256]; // max size 255 plus zero ending // e.g. "interface 1" LONG ifType; LONG ifMtu; @@ -105,7 +95,7 @@ typedef struct tagSMib2Counter { DWORD ifOutErrors; DWORD ifOutQLen; DWORD ifSpecific; -} SMib2Counter, DEF* PSMib2Counter; +} SMib2Counter, *PSMib2Counter; // Value in the ifType entry //#define ETHERNETCSMACD 6 // @@ -142,7 +132,7 @@ typedef struct tagSRmonCounter { DWORD etherStatsPkt1024to1518Octets; DWORD etherStatsOwners; DWORD etherStatsStatus; -} SRmonCounter, DEF* PSRmonCounter; +} SRmonCounter, *PSRmonCounter; // // Custom counter @@ -180,7 +170,7 @@ typedef struct tagSCustomCounters { ULONGLONG ullRsr9MCRCOk; ULONGLONG ullRsr6MCRCOk; -} SCustomCounters, DEF* PSCustomCounters; +} SCustomCounters, *PSCustomCounters; // @@ -211,7 +201,7 @@ typedef struct tagSISRCounters { DWORD dwIsrSYNCFlushOK; DWORD dwIsrSTIMER1Int; ///////////////////////////////////// -} SISRCounters, DEF* PSISRCounters; +} SISRCounters, *PSISRCounters; // Value in the etherStatsStatus entry @@ -344,17 +334,13 @@ typedef struct tagSStatCounter { ULONG SignalStren; ULONG LinkQuality; #endif -} SStatCounter, DEF* PSStatCounter; +} SStatCounter, *PSStatCounter; /*--------------------- Export Classes ----------------------------*/ /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - void STAvClearAllCounter(PSStatCounter pStatistic); @@ -386,13 +372,6 @@ void STAvUpdate802_11Counter( void STAvClear802_11Counter(PSDot11Counters p802_11Counter); -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __MIB_H__ |