From owner-svn-src-all@FreeBSD.ORG  Tue Dec 18 01:17:08 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0BF58A66;
 Tue, 18 Dec 2012 01:17:08 +0000 (UTC)
 (envelope-from yanegomi@gmail.com)
Received: from mail-da0-f47.google.com (mail-da0-f47.google.com
 [209.85.210.47])
 by mx1.freebsd.org (Postfix) with ESMTP id B64008FC0A;
 Tue, 18 Dec 2012 01:17:07 +0000 (UTC)
Received: by mail-da0-f47.google.com with SMTP id s35so25807dak.20
 for <multiple recipients>; Mon, 17 Dec 2012 17:17:04 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=x-received:references:mime-version:in-reply-to:content-type
 :content-transfer-encoding:message-id:cc:x-mailer:from:subject:date
 :to; bh=Y2EZoK+i2cPe8Uz2JWGVJveHvY6qm+dWRWfNjY0aGr0=;
 b=FlndlyvyjUZ1h0+hpf8kS6xg2HZ2fznE6LBR+hfFMRjAlWdVqVAsjM2IZ176TAiZF2
 zkrWX1W1snAMGRQ28JTB0p62n1EQOvbl4rhfqnghxF9Ba4VrdD7hGVnCY73WkK4COkA9
 yAHreNsh1YnG+A6oYWxC1iBF4sjxLYVmx/1xyNDKlrvut4fL+PIG/bfz/wz2YsvrOuKJ
 4GS8tPnl+bvwFXIde8MGoRRjT2OsLObM07qiuZGztkKEbpCzCn3vOoQ15OR6uZrKOQfN
 IuZjprUqG55+IOkWUBS4fCftXDL384e/ehaz+rAzH27xzgKW0Q/+/by1c2U0/zkaQ1jx
 n5EQ==
X-Received: by 10.66.73.105 with SMTP id k9mr1478639pav.37.1355793424810;
 Mon, 17 Dec 2012 17:17:04 -0800 (PST)
Received: from [10.197.2.164] (mobile-166-147-095-021.mycingular.net.
 [166.147.95.21])
 by mx.google.com with ESMTPS id sk1sm105399pbc.0.2012.12.17.17.16.55
 (version=SSLv3 cipher=OTHER); Mon, 17 Dec 2012 17:17:03 -0800 (PST)
References: <201212172055.qBHKtYgX070163@svn.freebsd.org>
Mime-Version: 1.0 (1.0)
In-Reply-To: <201212172055.qBHKtYgX070163@svn.freebsd.org>
Content-Type: text/plain;
	charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Message-Id: <3E7ACF8A-3192-40C1-9F42-C701BF3483CE@gmail.com>
X-Mailer: iPhone Mail (10A523)
From: Garrett Cooper <yanegomi@gmail.com>
Subject: Re: svn commit: r244365 - head/sys/netinet
Date: Mon, 17 Dec 2012 17:16:51 -0800
To: "Andrey V. Elsukov" <ae@FreeBSD.org>
Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>,
 "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
 "src-committers@freebsd.org" <src-committers@freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Dec 2012 01:17:08 -0000

This broke !inet6 kernels.

Sent from my iPhone

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

> Author: ae
> Date: Mon Dec 17 20:55:33 2012
> New Revision: 244365
> URL: http://svnweb.freebsd.org/changeset/base/244365
>=20
> 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.
>=20
>  MFC after:    3 days
>=20
> Modified:
>  head/sys/netinet/tcp_input.c
>=20
> Modified: head/sys/netinet/tcp_input.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
> --- 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 =3D m_tag_find(m, PACKET_TAG_IPFORWARD, NULL);
>=20
> #ifdef INET6
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"