From owner-svn-src-head@FreeBSD.ORG Tue Jul 21 19:25:25 2009 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 A7BD01065673; Tue, 21 Jul 2009 19:25:25 +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 7BE888FC2A; Tue, 21 Jul 2009 19:25:25 +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 n6LJPPCs019946; Tue, 21 Jul 2009 19:25:25 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6LJPPgw019944; Tue, 21 Jul 2009 19:25:25 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200907211925.n6LJPPgw019944@svn.freebsd.org> From: Sam Leffler Date: Tue, 21 Jul 2009 19:25:25 +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: r195811 - 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: Tue, 21 Jul 2009 19:25:26 -0000 Author: sam Date: Tue Jul 21 19:25:25 2009 New Revision: 195811 URL: http://svn.freebsd.org/changeset/base/195811 Log: update for recent mesh additions Approved by: re (kib) Modified: head/tools/tools/net80211/wlanstats/wlanstats.c Modified: head/tools/tools/net80211/wlanstats/wlanstats.c ============================================================================== --- head/tools/tools/net80211/wlanstats/wlanstats.c Tue Jul 21 19:24:53 2009 (r195810) +++ head/tools/tools/net80211/wlanstats/wlanstats.c Tue Jul 21 19:25:25 2009 (r195811) @@ -342,7 +342,15 @@ static const struct fmt wlanstats[] = { { 4, "hwmp_rootreqs", "hwmp_rootreqs", "root PREQ frames sent" }, #define S_HWMP_ROOTANN AFTER(S_HWMP_ROOTREQS) { 4, "hwmp_rootann", "hwmp_rootann", "root RANN frames received" }, -#define S_INPUT AFTER(S_HWMP_ROOTANN) +#define S_MESH_BADAE AFTER(S_HWMP_ROOTANN) + { 4, "mesh_badae", "mesh_badae", "frame discarded for bad AddressExtension (AE)" }, +#define S_MESH_RTADDFAILED AFTER(S_MESH_BADAE) + { 4, "mesh_rtadd", "mesh_rtadd", "mesh route add failed" }, +#define S_MESH_NOTPROXY AFTER(S_MESH_RTADDFAILED) + { 8, "mesh_notproxy", "mesh_notproxy","frame discarded because station not acting as a proxy" }, +#define S_RX_BADALIGN AFTER(S_MESH_NOTPROXY) + { 4, "rx_badalign", "rx_badalign","frame discarded because payload re-alignment failed" }, +#define S_INPUT AFTER(S_RX_BADALIGN) { 8, "input", "input", "total data frames received" }, #define S_RX_UCAST AFTER(S_INPUT) { 8, "rx_ucast", "rx_ucast", "unicast data frames received" }, @@ -796,6 +804,10 @@ wlan_get_curstat(struct statfoo *sf, int case S_HWMP_WRONGSEQ: STAT(hwmp_wrongseq); case S_HWMP_ROOTREQS: STAT(hwmp_rootreqs); case S_HWMP_ROOTANN: STAT(hwmp_rootrann); + case S_MESH_BADAE: STAT(mesh_badae); + case S_MESH_RTADDFAILED:STAT(mesh_rtaddfailed); + case S_MESH_NOTPROXY: STAT(mesh_notproxy); + case S_RX_BADALIGN: STAT(rx_badalign); case S_INPUT: NSTAT(rx_data); case S_OUTPUT: NSTAT(tx_data); case S_RX_UCAST: NSTAT(rx_ucast); @@ -950,6 +962,10 @@ wlan_get_totstat(struct statfoo *sf, int case S_HWMP_WRONGSEQ: STAT(hwmp_wrongseq); case S_HWMP_ROOTREQS: STAT(hwmp_rootreqs); case S_HWMP_ROOTANN: STAT(hwmp_rootrann); + case S_MESH_BADAE: STAT(mesh_badae); + case S_MESH_RTADDFAILED:STAT(mesh_rtaddfailed); + case S_MESH_NOTPROXY: STAT(mesh_notproxy); + case S_RX_BADALIGN: STAT(rx_badalign); case S_INPUT: NSTAT(rx_data); case S_OUTPUT: NSTAT(tx_data); case S_RX_UCAST: NSTAT(rx_ucast);