From owner-svn-src-user@FreeBSD.ORG Tue Aug 30 04:32:16 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 8F1BB106566C; Tue, 30 Aug 2011 04:32:16 +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 65ACF8FC0A; Tue, 30 Aug 2011 04:32:16 +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 p7U4WGY1032586; Tue, 30 Aug 2011 04:32:16 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7U4WGbm032582; Tue, 30 Aug 2011 04:32:16 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108300432.p7U4WGbm032582@svn.freebsd.org> From: Adrian Chadd Date: Tue, 30 Aug 2011 04:32:16 +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: r225258 - user/adrian/if_ath_tx/sys/dev/ath 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:32:16 -0000 Author: adrian Date: Tue Aug 30 04:32:16 2011 New Revision: 225258 URL: http://svn.freebsd.org/changeset/base/225258 Log: * correctly bump the max sw retry counter on failed aggregate frames * add a new field which increments when an whole aggregate frame fails to TX Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c Tue Aug 30 04:30:41 2011 (r225257) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_sysctl.c Tue Aug 30 04:32:16 2011 (r225258) @@ -809,6 +809,9 @@ ath_sysctl_stats_attach(struct ath_softc &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)"); /* Attach the RX phy error array */ ath_sysctl_stats_attach_rxphyerr(sc, child); Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Tue Aug 30 04:30:41 2011 (r225257) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Tue Aug 30 04:32:16 2011 (r225258) @@ -2644,6 +2644,7 @@ ath_tx_retry_subframe(struct ath_softc * } if (bf->bf_state.bfs_retries >= SWMAX_RETRIES) { + sc->sc_stats.ast_tx_swretrymax++; DPRINTF(sc, ATH_DEBUG_SW_TX_RETRIES, "%s: max retries: seqno %d\n", __func__, SEQNO(bf->bf_state.bfs_seqno)); @@ -2685,6 +2686,7 @@ ath_tx_comp_aggr_error(struct ath_softc tap = ath_tx_get_tx_tid(an, tid->tid); TAILQ_INIT(&bf_q); + sc->sc_stats.ast_tx_aggrfail++; /* * Update rate control - all frames have failed. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Tue Aug 30 04:30:41 2011 (r225257) +++ user/adrian/if_ath_tx/sys/dev/ath/if_athioctl.h Tue Aug 30 04:32:16 2011 (r225258) @@ -146,6 +146,7 @@ struct ath_stats { 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 */ struct ath_tx_aggr_stats tx_aggr; u_int32_t ast_pad[9]; };