From owner-p4-projects@FreeBSD.ORG Tue Apr 29 19:33:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BCED106566C; Tue, 29 Apr 2008 19:33:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B84BC106567A for ; Tue, 29 Apr 2008 19:33:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A6E768FC1D for ; Tue, 29 Apr 2008 19:33:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3TJXhZD021543 for ; Tue, 29 Apr 2008 19:33:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3TJXhUw021541 for perforce@freebsd.org; Tue, 29 Apr 2008 19:33:43 GMT (envelope-from sam@freebsd.org) Date: Tue, 29 Apr 2008 19:33:43 GMT Message-Id: <200804291933.m3TJXhUw021541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 140884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2008 19:33:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=140884 Change 140884 by sam@sam_ebb on 2008/04/29 19:33:40 try to make default display more useful for sta operation Affected files ... .. //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#7 edit .. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#10 edit Differences ... ==== //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#7 (text+ko) ==== @@ -49,7 +49,7 @@ #include "wlanstats.h" #define S_DEFAULT \ - "input,output,rx_ucast,rx_mcast,tx_ucast,tx_mcast,rssi,rate" + "input,rx_mgmt,output,rx_badkeyid,scan_active,scan_bg,bmiss,rssi,noise,rate" #define S_AMPDU \ "input,output,ampdu_reorder,ampdu_oor,rx_dup,ampdu_flush,ampdu_move,ampdu_drop,ampdu_bar,ampdu_baroow,ampdu_barmove,rssi,rate" ==== //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#10 (text+ko) ==== @@ -157,7 +157,7 @@ { 5, "rx_unauth", "unauth", "rx discard 'cuz port unauthorized" }, #define S_RX_BADKEYID AFTER(S_RX_UNAUTH) - { 5, "rx_badkeyid", "badkeyid", "rx w/ incorrect keyid" }, + { 5, "rx_badkeyid", "rxkid", "rx w/ incorrect keyid" }, #define S_RX_CCMPREPLAY AFTER(S_RX_BADKEYID) { 5, "rx_ccmpreplay", "ccmpreplay", "rx seq# violation (CCMP)" }, #define S_RX_CCMPFORMAT AFTER(S_RX_CCMPREPLAY) @@ -195,11 +195,11 @@ #define S_TX_FRAGS AFTER(S_TX_FRAGFRAMES) { 5, "tx_frags", "frags", "tx frags generated" }, #define S_SCAN_ACTIVE AFTER(S_TX_FRAGS) - { 5, "scan_active", "scan_active", "active scans started" }, + { 5, "scan_active", "ascan", "active scans started" }, #define S_SCAN_PASSIVE AFTER(S_SCAN_ACTIVE) - { 5, "scan_passive", "scan_passive", "passive scans started" }, + { 5, "scan_passive", "pscan", "passive scans started" }, #define S_SCAN_BG AFTER(S_SCAN_PASSIVE) - { 5, "scan_bg", "scan_bg", "background scans started" }, + { 5, "scan_bg", "bgscn", "background scans started" }, #define S_NODE_TIMEOUT AFTER(S_SCAN_BG) { 5, "node_timeout", "node_timeout", "nodes timed out for inactivity" }, #define S_CRYPTO_NOMEM AFTER(S_NODE_TIMEOUT) @@ -259,7 +259,7 @@ #define S_RX_BADBINTVAL AFTER(S_FF_ENCAPFAIL) { 5, "rx_badbintval", "rx_badbintval","rx frame with bogus beacon interval" }, #define S_RX_MGMT AFTER(S_RX_BADBINTVAL) - { 5, "rx_mgmt", "rx_mgmt", "rx management frames" }, + { 5, "rx_mgmt", "mgmt", "rx management frames" }, #define S_RX_DEMICFAIL AFTER(S_RX_MGMT) { 5, "rx_demicfail", "rx_demicfail", "rx demic failed" }, #define S_RX_DEFRAG AFTER(S_RX_DEMICFAIL) @@ -335,13 +335,13 @@ #define S_TX_MCAST AFTER(S_TX_UCAST) { 8, "tx_mcast", "tx_mcast", "multicast data frames sent" }, #define S_RATE AFTER(S_TX_MCAST) - { 4, "rate", "rate", "current transmit rate" }, + { 5, "rate", "rate", "current transmit rate" }, #define S_RSSI AFTER(S_RATE) - { 4, "rssi", "rssi", "current rssi" }, + { 5, "rssi", "rssi", "current rssi" }, #define S_NOISE AFTER(S_RSSI) - { 4, "noise", "noise", "current noise floor (dBm)" }, + { 5, "noise", "noise", "current noise floor (dBm)" }, #define S_SIGNAL AFTER(S_NOISE) - { 4, "signal", "sig", "current signal (dBm)" }, + { 5, "signal", "sig", "current signal (dBm)" }, }; struct wlanstatfoo_p {