Date: Thu, 9 Jan 2014 12:46:55 -0800 From: John-Mark Gurney <jmg@funkthat.com> To: "Andrey V. Elsukov" <ae@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r260485 - head/sys/netinet6 Message-ID: <20140109204655.GH46596@funkthat.com> In-Reply-To: <201401091538.s09FcTNM097296@svn.freebsd.org> References: <201401091538.s09FcTNM097296@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140109204655.GH46596>