From owner-svn-src-head@FreeBSD.ORG  Mon Dec 19 17:32:55 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 588531065677;
	Mon, 19 Dec 2011 17:32:55 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 474238FC1A;
	Mon, 19 Dec 2011 17:32:55 +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 pBJHWtA3067920;
	Mon, 19 Dec 2011 17:32:55 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBJHWta3067918;
	Mon, 19 Dec 2011 17:32:55 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201112191732.pBJHWta3067918@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 19 Dec 2011 17:32:55 +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: r228713 - head/contrib/tcpdump
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Dec 2011 17:32:55 -0000

Author: dim
Date: Mon Dec 19 17:32:54 2011
New Revision: 228713
URL: http://svn.freebsd.org/changeset/base/228713

Log:
  In contrib/tcpdump/print-icmp6.c, fix a problem where the comparison
  against icmp6_hdr::icmp6_type is done incorrectly.  (This fix has
  already been applied upstream, but we do not have the latest version of
  tcpdump.)
  
  MFC after:	1 week

Modified:
  head/contrib/tcpdump/print-icmp6.c

Modified: head/contrib/tcpdump/print-icmp6.c
==============================================================================
--- head/contrib/tcpdump/print-icmp6.c	Mon Dec 19 15:46:15 2011	(r228712)
+++ head/contrib/tcpdump/print-icmp6.c	Mon Dec 19 17:32:54 2011	(r228713)
@@ -350,14 +350,13 @@ icmp6_print(netdissect_options *ndo,
         printf("ICMP6, %s", tok2str(icmp6_type_values,"unknown icmp6 type (%u)",dp->icmp6_type));
 
         /* display cosmetics: print the packet length for printer that use the vflag now */
-        if (vflag && (dp->icmp6_type ==
-                      ND_ROUTER_SOLICIT ||
-                      ND_ROUTER_ADVERT ||
-                      ND_NEIGHBOR_ADVERT ||
-                      ND_NEIGHBOR_SOLICIT ||
-                      ND_REDIRECT ||
-                      ICMP6_HADISCOV_REPLY ||
-                      ICMP6_MOBILEPREFIX_ADVERT ))
+        if (vflag && (dp->icmp6_type == ND_ROUTER_SOLICIT ||
+                      dp->icmp6_type == ND_ROUTER_ADVERT ||
+                      dp->icmp6_type == ND_NEIGHBOR_ADVERT ||
+                      dp->icmp6_type == ND_NEIGHBOR_SOLICIT ||
+                      dp->icmp6_type == ND_REDIRECT ||
+                      dp->icmp6_type == ICMP6_HADISCOV_REPLY ||
+                      dp->icmp6_type == ICMP6_MOBILEPREFIX_ADVERT ))
             printf(", length %u", length);
                       
 	switch (dp->icmp6_type) {