diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
tree | 2875806beb96ea0cdab292146767a5085721dc6a /drivers/staging/vt6656/mib.h | |
parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'drivers/staging/vt6656/mib.h')
-rw-r--r-- | drivers/staging/vt6656/mib.h | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/drivers/staging/vt6656/mib.h b/drivers/staging/vt6656/mib.h index 0455ec9d327d..a89cca0c5ecf 100644 --- a/drivers/staging/vt6656/mib.h +++ b/drivers/staging/vt6656/mib.h @@ -356,7 +356,6 @@ typedef struct tagSStatCounter { SCustomCounters CustomStat; - #ifdef Calcu_LinkQual //Tx count: unsigned long TxNoRetryOkCount; /* success tx no retry ! */ unsigned long TxRetryOkCount; /* success tx but retry ! */ @@ -367,12 +366,9 @@ typedef struct tagSStatCounter { //statistic unsigned long SignalStren; unsigned long LinkQuality; - #endif } SStatCounter, *PSStatCounter; -#define NTSTATUS int - /*--------------------- Export Classes ----------------------------*/ /*--------------------- Export Variables --------------------------*/ @@ -381,7 +377,9 @@ typedef struct tagSStatCounter { void STAvClearAllCounter(PSStatCounter pStatistic); -void STAvUpdateIsrStatCounter (PSStatCounter pStatistic, BYTE byIsr0, BYTE byIsr1); +void STAvUpdateIsrStatCounter(PSStatCounter pStatistic, + BYTE byIsr0, + BYTE byIsr1); void STAvUpdateRDStatCounter(PSStatCounter pStatistic, BYTE byRSR, BYTE byNewRSR, BYTE byRxSts, @@ -393,14 +391,8 @@ void STAvUpdateRDStatCounterEx(PSStatCounter pStatistic, BYTE byRxRate, PBYTE pbyBuffer, unsigned int cbFrameLength); -void -STAvUpdateTDStatCounter ( - PSStatCounter pStatistic, - BYTE byPktNum, - BYTE byRate, - BYTE byTSR - ); - +void STAvUpdateTDStatCounter(PSStatCounter pStatistic, BYTE byPktNum, + BYTE byRate, BYTE byTSR); void STAvUpdate802_11Counter( @@ -413,11 +405,6 @@ STAvUpdate802_11Counter( ); void STAvClear802_11Counter(PSDot11Counters p802_11Counter); - -void -STAvUpdateUSBCounter( - PSUSBCounter pUsbCounter, - NTSTATUS ntStatus - ); +void STAvUpdateUSBCounter(PSUSBCounter pUsbCounter, int ntStatus); #endif /* __MIB_H__ */ |