From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 05:52:10 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E604106564A; Fri, 13 Feb 2009 05:52:10 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D1C28FC12; Fri, 13 Feb 2009 05:52:10 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1D5qAVn078194; Fri, 13 Feb 2009 05:52:10 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1D5qA6V078193; Fri, 13 Feb 2009 05:52:10 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902130552.n1D5qA6V078193@svn.freebsd.org> From: Sam Leffler Date: Fri, 13 Feb 2009 05:52:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188566 - in projects/vap7/tools/tools/ath: . athstats X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2009 05:52:10 -0000 Author: sam Date: Fri Feb 13 05:52:10 2009 New Revision: 188566 URL: http://svn.freebsd.org/changeset/base/188566 Log: merge r188559: add stats no frags and missing stat for no dma buffers Modified: projects/vap7/tools/tools/ath/ (props changed) projects/vap7/tools/tools/ath/athstats/athstats.c Modified: projects/vap7/tools/tools/ath/athstats/athstats.c ============================================================================== --- projects/vap7/tools/tools/ath/athstats/athstats.c Fri Feb 13 05:51:36 2009 (r188565) +++ projects/vap7/tools/tools/ath/athstats/athstats.c Fri Feb 13 05:52:10 2009 (r188566) @@ -116,7 +116,11 @@ static const struct fmt athstats[] = { { 5, "txencode", "txencode", "tx encapsulation failed" }, #define S_TX_NONODE AFTER(S_TX_ENCAP) { 5, "txnonode", "txnonode", "tx failed 'cuz no node" }, -#define S_TX_NOMBUF AFTER(S_TX_NONODE) +#define S_TX_NOBUF AFTER(S_TX_NONODE) + { 5, "txnobuf", "txnobuf", "tx failed 'cuz dma buffer allocation failed" }, +#define S_TX_NOFRAG AFTER(S_TX_NOBUF) + { 5, "txnofrag", "txnofrag", "tx failed 'cuz frag buffer allocation(s) failed" }, +#define S_TX_NOMBUF AFTER(S_TX_NOFRAG) { 5, "txnombuf", "txnombuf", "tx failed 'cuz mbuf allocation failed" }, #ifndef __linux__ #define S_TX_NOMCL AFTER(S_TX_NOMBUF) @@ -542,6 +546,8 @@ ath_get_curstat(struct statfoo *sf, int case S_TX_QSTOP: STAT(tx_qstop); case S_TX_ENCAP: STAT(tx_encap); case S_TX_NONODE: STAT(tx_nonode); + case S_TX_NOBUF: STAT(tx_nobuf); + case S_TX_NOFRAG: STAT(tx_nofrag); case S_TX_NOMBUF: STAT(tx_nombuf); #ifdef S_TX_NOMCL case S_TX_NOMCL: STAT(tx_nomcl); @@ -759,6 +765,8 @@ ath_get_totstat(struct statfoo *sf, int case S_TX_QSTOP: STAT(tx_qstop); case S_TX_ENCAP: STAT(tx_encap); case S_TX_NONODE: STAT(tx_nonode); + case S_TX_NOBUF: STAT(tx_nobuf); + case S_TX_NOFRAG: STAT(tx_nofrag); case S_TX_NOMBUF: STAT(tx_nombuf); #ifdef S_TX_NOMCL case S_TX_NOMCL: STAT(tx_nomcl);