summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2011-11-23 05:01:23 +0000
committeradrian <adrian@FreeBSD.org>2011-11-23 05:01:23 +0000
commit2b50b95846a848fb1dac45e74df5c8b172a3c739 (patch)
treef37d91e3cfd6f4f48287f11e0dfe2794521dadca /tools
parentdaf0131aaf944af331f9a635ec31cd9c5bee06e6 (diff)
downloadFreeBSD-src-2b50b95846a848fb1dac45e74df5c8b172a3c739.zip
FreeBSD-src-2b50b95846a848fb1dac45e74df5c8b172a3c739.tar.gz
Add the new statistics introduced in r227868.
Sponsored by: Hobnob, Inc.
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/ath/athstats/athstats.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/tools/tools/ath/athstats/athstats.c b/tools/tools/ath/athstats/athstats.c
index c57b2f3..0c3b376 100644
--- a/tools/tools/ath/athstats/athstats.c
+++ b/tools/tools/ath/athstats/athstats.c
@@ -284,10 +284,14 @@ static const struct fmt athstats[] = {
{ 5, "txdataunderrun", "TXDAU", "A-MPDU TX FIFO data underrun" },
#define S_TX_DELIM_UNDERRUN AFTER(S_TX_DATA_UNDERRUN)
{ 5, "txdelimunderrun", "TXDEU", "A-MPDU TX Delimiter underrun" },
-#define S_TX_AGGR_FAIL AFTER(S_TX_DELIM_UNDERRUN)
- { 10, "txaggrfail", "txaggrfail", "A-MPDU TX attempt failed" },
+#define S_TX_AGGR_OK AFTER(S_TX_DELIM_UNDERRUN)
+ { 5, "txaggrok", "TXAOK", "A-MPDU sub-frame TX attempt success" },
+#define S_TX_AGGR_FAIL AFTER(S_TX_AGGR_OK)
+ { 4, "txaggrfail", "TXAF", "A-MPDU sub-frame TX attempt success" },
+#define S_TX_AGGR_FAILALL AFTER(S_TX_AGGR_FAIL)
+ { 7, "txaggrfailall", "TXAFALL", "A-MPDU sub-frame TX attempt success" },
#ifndef __linux__
-#define S_CABQ_XMIT AFTER(S_TX_AGGR_FAIL)
+#define S_CABQ_XMIT AFTER(S_TX_AGGR_FAILALL)
{ 5, "cabxmit", "cabxmit", "cabq frames transmitted" },
#define S_CABQ_BUSY AFTER(S_CABQ_XMIT)
{ 5, "cabqbusy", "cabqbusy", "cabq xmit overflowed beacon interval" },
@@ -299,7 +303,7 @@ static const struct fmt athstats[] = {
{ 5, "rxbusdma", "rxbusdma", "rx setup failed for dma resrcs" },
#define S_FF_TXOK AFTER(S_RX_BUSDMA)
#else
-#define S_FF_TXOK AFTER(S_TX_AGGR_FAIL)
+#define S_FF_TXOK AFTER(S_TX_AGGR_FAILALL)
#endif
{ 5, "fftxok", "fftxok", "fast frames xmit successfully" },
#define S_FF_TXERR AFTER(S_FF_TXOK)
@@ -775,7 +779,9 @@ ath_get_curstat(struct statfoo *sf, int s, char b[], size_t bs)
case S_TX_SWRETRIES_MAX: STAT(tx_swretrymax);
case S_TX_DATA_UNDERRUN: STAT(tx_data_underrun);
case S_TX_DELIM_UNDERRUN: STAT(tx_delim_underrun);
- case S_TX_AGGR_FAIL: STAT(tx_aggrfail);
+ case S_TX_AGGR_OK: STAT(tx_aggr_ok);
+ case S_TX_AGGR_FAIL: STAT(tx_aggr_fail);
+ case S_TX_AGGR_FAILALL: STAT(tx_aggr_failall);
}
b[0] = '\0';
return 0;
@@ -1014,9 +1020,10 @@ ath_get_totstat(struct statfoo *sf, int s, char b[], size_t bs)
case S_TX_SWRETRIES_MAX: STAT(tx_swretrymax);
case S_TX_DATA_UNDERRUN: STAT(tx_data_underrun);
case S_TX_DELIM_UNDERRUN: STAT(tx_delim_underrun);
- case S_TX_AGGR_FAIL: STAT(tx_aggrfail);
+ case S_TX_AGGR_OK: STAT(tx_aggr_ok);
+ case S_TX_AGGR_FAIL: STAT(tx_aggr_fail);
+ case S_TX_AGGR_FAILALL: STAT(tx_aggr_failall);
}
-
b[0] = '\0';
return 0;
#undef RXANT
OpenPOWER on IntegriCloud