svn commit: r263091 - in head/sys: netinet netinet6

[Andrey Chernov]

On 12.03.2014 18:29, Gleb Smirnoff wrote:
> --- head/sys/netinet/ip_input.c	Wed Mar 12 12:27:13 2014	(r263090)
> +++ head/sys/netinet/ip_input.c	Wed Mar 12 14:29:08 2014	(r263091)
> @@ -794,6 +795,8 @@ SYSCTL_PROC(_net_inet_ip, OID_AUTO, maxf
>      NULL, 0, sysctl_maxnipq, "I",
>      "Maximum number of IPv4 fragment reassembly queue entries");
>  
> +#define	M_IP_FRAG	M_PROTO9
> +
>  /*
>   * Take incoming datagram fragment and try to reassemble it into
>   * whole datagram.  If the argument is the first fragment or one
> 
> Modified: head/sys/netinet6/in6.h
> ==============================================================================
> --- head/sys/netinet6/in6.h	Wed Mar 12 12:27:13 2014	(r263090)
> +++ head/sys/netinet6/in6.h	Wed Mar 12 14:29:08 2014	(r263091)
> @@ -622,13 +622,18 @@ struct ip6_mtuinfo {
>  #endif /* __BSD_VISIBLE */
>  
>  /*
> - * Redefinition of mbuf flags
> + * Since both netinet/ and netinet6/ call into netipsec/ and netpfil/,
> + * the protocol specific mbuf flags are shared between them.
>   */
> -#define	M_AUTHIPHDR	M_PROTO2
> -#define	M_DECRYPTED	M_PROTO3
> -#define	M_LOOP		M_PROTO4
> -#define	M_AUTHIPDGM	M_PROTO5
> -#define	M_RTALERT_MLD	M_PROTO6
> +#define	M_FASTFWD_OURS		M_PROTO1	/* changed dst to local */
> +#define	M_IP6_NEXTHOP		M_PROTO2	/* explicit ip nexthop */
> +#define	M_IP_NEXTHOP		M_PROTO2	/* explicit ip nexthop */
> +#define	M_SKIP_FIREWALL		M_PROTO3	/* skip firewall processing */
> +#define	M_AUTHIPHDR		M_PROTO4
> +#define	M_DECRYPTED		M_PROTO5
> +#define	M_LOOP			M_PROTO6
> +#define	M_AUTHIPDGM		M_PROTO7
> +#define	M_RTALERT_MLD		M_PROTO8
>  

Next time someone add new mbuf flag to in6.h, it will be M_PROTO9 and
situation repeat itself, since you left M_PROTO9 in ip_input.c

-- 
http://ache.vniz.net/