From owner-svn-src-user@FreeBSD.ORG Tue Aug 30 04:30:41 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB754106566B; Tue, 30 Aug 2011 04:30:41 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A23968FC15; Tue, 30 Aug 2011 04:30:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7U4UfRB032500; Tue, 30 Aug 2011 04:30:41 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7U4Ufwa032498; Tue, 30 Aug 2011 04:30:41 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108300430.p7U4Ufwa032498@svn.freebsd.org> From: Adrian Chadd Date: Tue, 30 Aug 2011 04:30:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225257 - user/adrian/if_ath_tx/tools/tools/ath/athstats X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Aug 2011 04:30:41 -0000 Author: adrian Date: Tue Aug 30 04:30:41 2011 New Revision: 225257 URL: http://svn.freebsd.org/changeset/base/225257 Log: Add in another new field Modified: user/adrian/if_ath_tx/tools/tools/ath/athstats/athstats.c Modified: user/adrian/if_ath_tx/tools/tools/ath/athstats/athstats.c ============================================================================== --- user/adrian/if_ath_tx/tools/tools/ath/athstats/athstats.c Tue Aug 30 04:23:32 2011 (r225256) +++ user/adrian/if_ath_tx/tools/tools/ath/athstats/athstats.c Tue Aug 30 04:30:41 2011 (r225257) @@ -284,8 +284,10 @@ static const struct fmt athstats[] = { { 4, "txdataunderrun", "txdataunderrun", "A-MPDU TX FIFO data underrun" }, #define S_TX_DELIM_UNDERRUN AFTER(S_TX_DATA_UNDERRUN) { 4, "txdelimunderrun", "txdelimunderrun", "A-MPDU TX Delimiter underrun" }, +#define S_TX_AGGR_FAIL AFTER(S_TX_DELIM_UNDERRUN) + { 4, "txaggrfail", "txaggrfail", "A-MPDU TX attempt failed" }, #ifndef __linux__ -#define S_CABQ_XMIT AFTER(S_TX_DELIM_UNDERRUN) +#define S_CABQ_XMIT AFTER(S_TX_AGGR_FAIL) { 5, "cabxmit", "cabxmit", "cabq frames transmitted" }, #define S_CABQ_BUSY AFTER(S_CABQ_XMIT) { 5, "cabqbusy", "cabqbusy", "cabq xmit overflowed beacon interval" }, @@ -297,7 +299,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_DELIM_UNDERRUN) +#define S_FF_TXOK AFTER(S_TX_AGGR_FAIL) #endif { 5, "fftxok", "fftxok", "fast frames xmit successfully" }, #define S_FF_TXERR AFTER(S_FF_TXOK) @@ -773,6 +775,7 @@ ath_get_curstat(struct statfoo *sf, int 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); } b[0] = '\0'; return 0; @@ -1011,6 +1014,7 @@ ath_get_totstat(struct statfoo *sf, int 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); } b[0] = '\0';