From owner-svn-src-stable@FreeBSD.ORG  Thu Jan 22 09:39:12 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F385C1065672;
	Thu, 22 Jan 2009 09:39:11 +0000 (UTC)
	(envelope-from maxim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E16C58FC2F;
	Thu, 22 Jan 2009 09:39:11 +0000 (UTC)
	(envelope-from maxim@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 n0M9dBSl006566;
	Thu, 22 Jan 2009 09:39:11 GMT (envelope-from maxim@svn.freebsd.org)
Received: (from maxim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0M9dBqx006565;
	Thu, 22 Jan 2009 09:39:11 GMT (envelope-from maxim@svn.freebsd.org)
Message-Id: <200901220939.n0M9dBqx006565@svn.freebsd.org>
From: Maxim Konovalov <maxim@FreeBSD.org>
Date: Thu, 22 Jan 2009 09:39:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187584 - stable/7/usr.bin/netstat
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jan 2009 09:39:12 -0000

Author: maxim
Date: Thu Jan 22 09:39:11 2009
New Revision: 187584
URL: http://svn.freebsd.org/changeset/base/187584

Log:
  MFC r187134: respect -ss flags for icmp6 "histogram of error messages"
  section.

Modified:
  stable/7/usr.bin/netstat/inet6.c

Modified: stable/7/usr.bin/netstat/inet6.c
==============================================================================
--- stable/7/usr.bin/netstat/inet6.c	Thu Jan 22 08:29:39 2009	(r187583)
+++ stable/7/usr.bin/netstat/inet6.c	Thu Jan 22 09:39:11 2009	(r187584)
@@ -866,7 +866,8 @@ icmp6_stats(u_long off, const char *name
 
 #define	p(f, m) if (icmp6stat.f || sflag <= 1) \
     printf(m, (uintmax_t)icmp6stat.f, plural(icmp6stat.f))
-#define	p_5(f, m) printf(m, (uintmax_t)icmp6stat.f)
+#define	p_5(f, m) if (icmp6stat.f || sflag <= 1) \
+    printf(m, (uintmax_t)icmp6stat.f)
 
 	p(icp6s_error, "\t%ju call%s to icmp6_error\n");
 	p(icp6s_canterror,