From owner-svn-src-head@FreeBSD.ORG Tue Dec 18 08:28:50 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 869D6826; Tue, 18 Dec 2012 08:28:50 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by mx1.freebsd.org (Postfix) with ESMTP id 850D48FC0C; Tue, 18 Dec 2012 08:28:49 +0000 (UTC) Received: by mail-wg0-f46.google.com with SMTP id dr13so138052wgb.1 for ; Tue, 18 Dec 2012 00:28:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=2Nmf82wun86o2QHzKCRuOY/rwY1W+dcA+04FFmdAZ14=; b=VHv/zC1ObcOA3x4mCrxjQz5qpwUe9k2IZdZQhTYQLd/D9FSfdbMES/9Dv/XYu+XaxL 3vvtkBv8f6IfhNw6K4EtibBRiEBXkaxifjHtejjKJjy+apyg4UBTfSocnlrOwwwRO9pg IGJhiZRfE0nWHzY83yf0HHxl2inxSmtS1FYx7LwMeCPYrbcAhnXCROYTytfwO4KXG4rr CvtsMp1epWmbEgVHa+vSQhLX0v+KZ4MgqB9DMulIER/67+7VEIn+HTCMXZXda1avHPQa 4wnohouC1fxmgcxnL7qBR+xYUH7hWmKmBMdcOK8jh11ifmws0u0nzc5MmmxsbhSKn5uP 6ewg== MIME-Version: 1.0 Received: by 10.180.87.102 with SMTP id w6mr2244804wiz.19.1355818879134; Tue, 18 Dec 2012 00:21:19 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.217.57.9 with HTTP; Tue, 18 Dec 2012 00:21:18 -0800 (PST) In-Reply-To: <201212180814.qBI8EGfe092798@svn.freebsd.org> References: <201212180814.qBI8EGfe092798@svn.freebsd.org> Date: Tue, 18 Dec 2012 00:21:18 -0800 X-Google-Sender-Auth: XTenKv1eGOBByJFgL0f8k-JTh5E Message-ID: Subject: Re: svn commit: r244387 - head/sys/netinet From: Adrian Chadd To: Gleb Smirnoff Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Dec 2012 08:28:50 -0000 Thanks! Adrian On 18 December 2012 00:14, Gleb Smirnoff 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