svn commit: r244365 - head/sys/netinet

[Garrett Cooper]

This broke !inet6 kernels.

Sent from my iPhone

On Dec 17, 2012, at 12:55 PM, "Andrey V. Elsukov" <ae at FreeBSD.org> wrote:

> Author: ae
> Date: Mon Dec 17 20:55:33 2012
> New Revision: 244365
> URL: http://svnweb.freebsd.org/changeset/base/244365
> 
> Log:
>  Since we use different flags to detect tcp forwarding, and we share the
>  same code for IPv4 and IPv6 in tcp_input, we should check both
>  M_IP_NEXTHOP and M_IP6_NEXTHOP flags.
> 
>  MFC after:    3 days
> 
> Modified:
>  head/sys/netinet/tcp_input.c
> 
> Modified: head/sys/netinet/tcp_input.c
> ==============================================================================
> --- head/sys/netinet/tcp_input.c    Mon Dec 17 20:36:56 2012    (r244364)
> +++ head/sys/netinet/tcp_input.c    Mon Dec 17 20:55:33 2012    (r244365)
> @@ -780,7 +780,8 @@ findpcb:
>    /*
>     * Grab info from PACKET_TAG_IPFORWARD tag prepended to the chain.
>     */
> -    if (m->m_flags & M_IP_NEXTHOP)
> +    if ((isipv6 && (m->m_flags & M_IP6_NEXTHOP)) ||
> +        (!isipv6 && (m->m_flags & M_IP_NEXTHOP)))
>        fwd_tag = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL);
> 
> #ifdef INET6
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"