diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/otus/80211core/performance.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/80211core/performance.h')
-rw-r--r-- | drivers/staging/otus/80211core/performance.h | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/drivers/staging/otus/80211core/performance.h b/drivers/staging/otus/80211core/performance.h deleted file mode 100644 index 29f658a..0000000 --- a/drivers/staging/otus/80211core/performance.h +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2007-2008 Atheros Communications Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#ifndef _PERFORMANCE_H -#define _PERFORMANCE_H - -#ifdef ZM_ENABLE_PERFORMANCE_EVALUATION - -struct zsSummary -{ - u32_t tx_msdu_count; - u32_t tx_mpdu_count; - u32_t rx_msdu_count; - u32_t rx_mpdu_count; - u32_t tick_base; - u16_t rx_seq_base; - u16_t rx_broken_seq; - u16_t rx_broken_sum; - u16_t rx_broken_seq_dis; - u16_t rx_duplicate_seq; - u16_t rx_duplicate_error; - u16_t rx_old_seq; - u16_t rx_lost_sum; - u16_t tx_idle_count; - u16_t rx_idle_count; - u16_t reset_count; - u16_t reset_sum; - u16_t rx_free; - u16_t rx_amsdu_len; - u16_t rx_flush; - u16_t rx_clear; - u32_t rx_reorder; -}; - -struct zsVariation -{ - u32_t tx_msdu_tick[100]; - u32_t tx_mpdu_tick[100]; - u32_t rx_msdu_tick[100]; - u32_t rx_mpdu_tick[100]; - - u32_t tx_msdu_mean; - u32_t tx_mpdu_mean; - u32_t rx_msdu_mean; - u32_t rx_mpdu_mean; - - u32_t tx_msdu_sum; - u32_t tx_mpdu_sum; - u32_t rx_msdu_sum; - u32_t rx_mpdu_sum; - - u32_t tx_msdu_var; - u32_t tx_mpdu_var; - u32_t rx_msdu_var; - u32_t rx_mpdu_var; -}; - -struct zsThroughput -{ - u32_t tx[50]; - u32_t rx[50]; - u16_t head; - u16_t tail; - u16_t size; - LARGE_INTEGER sys_time; - LARGE_INTEGER freq; -}; - -void zfiPerformanceInit(zdev_t* dev); -void zfiPerformanceRefresh(zdev_t* dev); - -void zfiTxPerformanceMSDU(zdev_t* dev, u32_t tick); -void zfiRxPerformanceMSDU(zdev_t* dev, u32_t tick); -void zfiTxPerformanceMPDU(zdev_t* dev, u32_t tick); -void zfiRxPerformanceMPDU(zdev_t* dev, zbuf_t* buf); -void zfiRxPerformanceSeq(zdev_t* dev, zbuf_t* buf); -void zfiRxPerformanceReg(zdev_t* dev, u32_t reg, u32_t rsp); -void zfiRxPerformanceDup(zdev_t* dev, zbuf_t* buf1, zbuf_t* buf2); -void zfiRxPerformanceFree(zdev_t* dev, zbuf_t* buf); -void zfiRxPerformanceAMSDU(zdev_t* dev, zbuf_t* buf, u16_t len); -void zfiRxPerformanceFlush(zdev_t* dev); -void zfiRxPerformanceClear(zdev_t* dev); -void zfiRxPerformanceReorder(zdev_t* dev); -#endif /* end of ZM_ENABLE_PERFORMANCE_EVALUATION */ -#endif /* end of _PERFORMANCE_H */ |