From owner-svn-src-head@FreeBSD.ORG Sun Apr 8 04:51:44 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89C0110656AE; Sun, 8 Apr 2012 04:51:44 +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 74F208FC12; Sun, 8 Apr 2012 04:51:44 +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 q384piFF093934; Sun, 8 Apr 2012 04:51:44 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q384piWh093932; Sun, 8 Apr 2012 04:51:44 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201204080451.q384piWh093932@svn.freebsd.org> From: Adrian Chadd Date: Sun, 8 Apr 2012 04:51:44 +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: r234019 - head/tools/tools/net80211/wlanstats X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2012 04:51:44 -0000 Author: adrian Date: Sun Apr 8 04:51:43 2012 New Revision: 234019 URL: http://svn.freebsd.org/changeset/base/234019 Log: Teach wlanstats about the new BAR TX statistics. Modified: head/tools/tools/net80211/wlanstats/wlanstats.c Modified: head/tools/tools/net80211/wlanstats/wlanstats.c ============================================================================== --- head/tools/tools/net80211/wlanstats/wlanstats.c Sun Apr 8 04:51:25 2012 (r234018) +++ head/tools/tools/net80211/wlanstats/wlanstats.c Sun Apr 8 04:51:43 2012 (r234019) @@ -372,6 +372,12 @@ static const struct fmt wlanstats[] = { { 5, "signal", "sig", "current signal (dBm)" }, #define S_BEACON_BAD AFTER(S_SIGNAL) { 9, "beacon_bad", "beaconbad", "bad beacons received" }, +#define S_AMPDU_BARTX AFTER(S_BEACON_BAD) + { 5, "ampdu_bartx", "bartx", "BAR frames sent" }, +#define S_AMPDU_BARTX_FAIL AFTER(S_AMPDU_BARTX) + { 9, "ampdu_bartxfail", "bartx_fail", "BAR frames failed to send" }, +#define S_AMPDU_BARTX_RETRY AFTER(S_AMPDU_BARTX_FAIL) + { 10, "ampdu_bartxretry", "bartx_retry", "BAR frames retried" }, }; struct wlanstatfoo_p { @@ -817,6 +823,9 @@ wlan_get_curstat(struct statfoo *sf, int case S_TX_UCAST: NSTAT(tx_ucast); case S_TX_MCAST: NSTAT(tx_mcast); case S_BEACON_BAD: STAT(beacon_bad); + case S_AMPDU_BARTX: STAT(ampdu_bar_tx); + case S_AMPDU_BARTX_RETRY: STAT(ampdu_bar_tx_retry); + case S_AMPDU_BARTX_FAIL: STAT(ampdu_bar_tx_fail); } return wlan_getinfo(wf, s, b, bs); #undef NSTAT @@ -976,6 +985,9 @@ wlan_get_totstat(struct statfoo *sf, int case S_TX_UCAST: NSTAT(tx_ucast); case S_TX_MCAST: NSTAT(tx_mcast); case S_BEACON_BAD: STAT(beacon_bad); + case S_AMPDU_BARTX: STAT(ampdu_bar_tx); + case S_AMPDU_BARTX_RETRY: STAT(ampdu_bar_tx_retry); + case S_AMPDU_BARTX_FAIL: STAT(ampdu_bar_tx_fail); } return wlan_getinfo(wf, s, b, bs); #undef NSTAT