From owner-svn-src-head@FreeBSD.ORG Thu Jan 9 20:46:57 2014 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 006E22DA; Thu, 9 Jan 2014 20:46:56 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AE0701D3F; Thu, 9 Jan 2014 20:46:56 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id s09KktqS056606 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 9 Jan 2014 12:46:56 -0800 (PST) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id s09KktSq056605; Thu, 9 Jan 2014 12:46:55 -0800 (PST) (envelope-from jmg) Date: Thu, 9 Jan 2014 12:46:55 -0800 From: John-Mark Gurney To: "Andrey V. Elsukov" Subject: Re: svn commit: r260485 - head/sys/netinet6 Message-ID: <20140109204655.GH46596@funkthat.com> References: <201401091538.s09FcTNM097296@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201401091538.s09FcTNM097296@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Thu, 09 Jan 2014 12:46:56 -0800 (PST) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 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: Thu, 09 Jan 2014 20:46:57 -0000 Andrey V. Elsukov wrote this message on Thu, Jan 09, 2014 at 15:38 +0000: > Author: ae > Date: Thu Jan 9 15:38:28 2014 > New Revision: 260485 > URL: http://svnweb.freebsd.org/changeset/base/260485 > > Log: > Remove extra nesting from X_ip6_mforward() function. > Also remove disabled definitions from ip6_mroute.h. [...] > Modified: head/sys/netinet6/ip6_mroute.h > ============================================================================== > --- head/sys/netinet6/ip6_mroute.h Thu Jan 9 15:35:35 2014 (r260484) > +++ head/sys/netinet6/ip6_mroute.h Thu Jan 9 15:38:28 2014 (r260485) > @@ -145,11 +145,6 @@ struct mrt6stat { > struct omrt6msg { > u_long unused1; > u_char im6_msgtype; /* what type of message */ > -#if 0 > -#define MRT6MSG_NOCACHE 1 > -#define MRT6MSG_WRONGMIF 2 > -#define MRT6MSG_WHOLEPKT 3 /* used for user level encap*/ > -#endif > u_char im6_mbz; /* must be zero */ > u_char im6_mif; /* mif rec'd on */ > u_char unused2; > @@ -199,7 +194,7 @@ struct sioc_mif_req6 { > u_quad_t obytes; /* Output byte count on mif */ > }; > > -#if defined(_KERNEL) || defined(KERNEL) > +#ifdef _KERNEL > /* > * The kernel's multicast-interface structure. > */ This last change broken netstat... netstat defines KERNEL to get these structures... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not."