From owner-p4-projects@FreeBSD.ORG  Tue Dec  4 04:16:42 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6849016A468; Tue,  4 Dec 2007 04:16:42 +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 0505816A420
	for <perforce@freebsd.org>; Tue,  4 Dec 2007 04:16:42 +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 F3D2813C465
	for <perforce@freebsd.org>; Tue,  4 Dec 2007 04:16:41 +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 lB44GfBF017526
	for <perforce@freebsd.org>; Tue, 4 Dec 2007 04:16:41 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB44GfZb017523
	for perforce@freebsd.org; Tue, 4 Dec 2007 04:16:41 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 4 Dec 2007 04:16:41 GMT
Message-Id: <200712040416.lB44GfZb017523@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130137 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Dec 2007 04:16:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=130137

Change 130137 by sam@sam_ebb on 2007/12/04 04:16:26

	sync w/ vap code

Affected files ...

.. //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#3 edit
.. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#3 edit

Differences ...

==== //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#3 (text+ko) ====

@@ -46,10 +46,12 @@
 #include <net/ethernet.h>
 #include <net80211/_ieee80211.h>
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <unistd.h>
 #include <err.h>
+#include <strings.h>
 
 #include "wlanstats.h"
 
@@ -146,7 +148,7 @@
 	int allnodes = 0;
 	int c, mode;
 
-	wf = wlanstats_new("ath0", S_DEFAULT);
+	wf = wlanstats_new("wlan0", S_DEFAULT);
 	while ((c = getopt(argc, argv, "ai:lm:o:")) != -1) {
 		switch (c) {
 		case 'a':

==== //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#3 (text+ko) ====

@@ -644,6 +644,8 @@
 	case S_TX_BADSTATE:	STAT(tx_badstate);
 	case S_TX_NOTASSOC:	STAT(tx_notassoc);
 	case S_TX_CLASSIFY:	STAT(tx_classify);
+	case S_DWDS_MCAST:	STAT(dwds_mcast);
+	case S_DWDS_QDROP:	STAT(dwds_qdrop);
 	case S_HT_ASSOC_NOHTCAP:STAT(ht_assoc_nohtcap);
 	case S_HT_ASSOC_DOWNGRADE:STAT(ht_assoc_downgrade);
 	case S_HT_ASSOC_NORATE:	STAT(ht_assoc_norate);
@@ -784,6 +786,8 @@
 	case S_TX_BADSTATE:	STAT(tx_badstate);
 	case S_TX_NOTASSOC:	STAT(tx_notassoc);
 	case S_TX_CLASSIFY:	STAT(tx_classify);
+	case S_DWDS_MCAST:	STAT(dwds_mcast);
+	case S_DWDS_QDROP:	STAT(dwds_qdrop);
 	case S_HT_ASSOC_NOHTCAP:STAT(ht_assoc_nohtcap);
 	case S_HT_ASSOC_DOWNGRADE:STAT(ht_assoc_downgrade);
 	case S_HT_ASSOC_NORATE:	STAT(ht_assoc_norate);