svn commit: r260485 - head/sys/netinet6

John-Mark Gurney jmg at funkthat.com
Thu Jan 9 20:46:57 UTC 2014


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."


More information about the svn-src-all mailing list