From owner-svn-src-all@FreeBSD.ORG Wed Oct 26 16:09:05 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86F0B1065673; Wed, 26 Oct 2011 16:09:05 +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 5D7698FC15; Wed, 26 Oct 2011 16:09:05 +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 p9QG95Ks057544; Wed, 26 Oct 2011 16:09:05 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QG95Kt057541; Wed, 26 Oct 2011 16:09:05 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110261609.p9QG95Kt057541@svn.freebsd.org> From: Adrian Chadd Date: Wed, 26 Oct 2011 16:09:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226798 - head/sys/dev/ath X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2011 16:09:05 -0000 Author: adrian Date: Wed Oct 26 16:09:05 2011 New Revision: 226798 URL: http://svn.freebsd.org/changeset/base/226798 Log: As a prelude to bringing over the 11n work, include some extra statistics fields. Modified: head/sys/dev/ath/if_ath_sysctl.c head/sys/dev/ath/if_athioctl.h Modified: head/sys/dev/ath/if_ath_sysctl.c ============================================================================== --- head/sys/dev/ath/if_ath_sysctl.c Wed Oct 26 15:52:03 2011 (r226797) +++ head/sys/dev/ath/if_ath_sysctl.c Wed Oct 26 16:09:05 2011 (r226798) @@ -729,6 +729,23 @@ ath_sysctl_stats_attach(struct ath_softc &sc->sc_stats.ast_tx_timerexpired, 0, "TX exceeded TX_TIMER register"); SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_desccfgerr", CTLFLAG_RD, &sc->sc_stats.ast_tx_desccfgerr, 0, "TX Descriptor Cfg Error"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_swretries", CTLFLAG_RD, + &sc->sc_stats.ast_tx_swretries, 0, "TX software retry count"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_swretrymax", CTLFLAG_RD, + &sc->sc_stats.ast_tx_swretrymax, 0, "TX software retry max reached"); + + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_data_underrun", CTLFLAG_RD, + &sc->sc_stats.ast_tx_data_underrun, 0, ""); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_delim_underrun", CTLFLAG_RD, + &sc->sc_stats.ast_tx_delim_underrun, 0, ""); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_aggrfail", CTLFLAG_RD, + &sc->sc_stats.ast_tx_aggrfail, 0, + "Number of aggregate TX failures (whole frame)"); + + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_rx_intr", CTLFLAG_RD, + &sc->sc_stats.ast_rx_intr, 0, "RX interrupts"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "ast_tx_intr", CTLFLAG_RD, + &sc->sc_stats.ast_tx_intr, 0, "TX interrupts"); /* Attach the RX phy error array */ ath_sysctl_stats_attach_rxphyerr(sc, child); Modified: head/sys/dev/ath/if_athioctl.h ============================================================================== --- head/sys/dev/ath/if_athioctl.h Wed Oct 26 15:52:03 2011 (r226797) +++ head/sys/dev/ath/if_athioctl.h Wed Oct 26 16:09:05 2011 (r226798) @@ -134,7 +134,16 @@ struct ath_stats { u_int32_t ast_tx_xtxop; /* tx exceeded TXOP */ u_int32_t ast_tx_timerexpired; /* tx exceeded TX_TIMER */ u_int32_t ast_tx_desccfgerr; /* tx desc cfg error */ - u_int32_t ast_pad[13]; + u_int32_t ast_tx_swretries; /* software TX retries */ + u_int32_t ast_tx_swretrymax; /* software TX retry max limit reach */ + u_int32_t ast_tx_data_underrun; + u_int32_t ast_tx_delim_underrun; + u_int32_t ast_tx_aggrfail; /* aggregate TX failed in its entirety */ + u_int32_t ast_tx_getnobuf; + u_int32_t ast_tx_getbusybuf; + u_int32_t ast_tx_intr; + u_int32_t ast_rx_intr; + u_int32_t ast_pad[4]; }; #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq)