svn commit: r244387 - head/sys/netinet

[Adrian Chadd]

Thanks!



Adrian


On 18 December 2012 00:14, Gleb Smirnoff <glebius at freebsd.org> wrote:
> Author: glebius
> Date: Tue Dec 18 08:14:16 2012
> New Revision: 244387
> URL: http://svnweb.freebsd.org/changeset/base/244387
>
> Log:
>   Fix !INET6 build after r244365.
>
> Modified:
>   head/sys/netinet/tcp_input.c
>
> Modified: head/sys/netinet/tcp_input.c
> ==============================================================================
> --- head/sys/netinet/tcp_input.c        Tue Dec 18 08:09:44 2012        (r244386)
> +++ head/sys/netinet/tcp_input.c        Tue Dec 18 08:14:16 2012        (r244387)
> @@ -780,8 +780,17 @@ findpcb:
>         /*
>          * Grab info from PACKET_TAG_IPFORWARD tag prepended to the chain.
>          */
> -       if ((isipv6 && (m->m_flags & M_IP6_NEXTHOP)) ||
> -           (!isipv6 && (m->m_flags & M_IP_NEXTHOP)))
> +        if (
> +#ifdef INET6
> +           (isipv6 && (m->m_flags & M_IP6_NEXTHOP))
> +#ifdef INET
> +           || (!isipv6 && (m->m_flags & M_IP_NEXTHOP))
> +#endif
> +#endif
> +#if defined(INET) && !defined(INET6)
> +           (m->m_flags & M_IP_NEXTHOP)
> +#endif
> +           )
>                 fwd_tag = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL);
>
>  #ifdef INET6