From owner-svn-src-all@FreeBSD.ORG  Mon Dec 17 20:55:34 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 8EB9472A;
 Mon, 17 Dec 2012 20:55:34 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 733868FC1A;
 Mon, 17 Dec 2012 20:55:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBHKtYui070165;
 Mon, 17 Dec 2012 20:55:34 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBHKtYgX070163;
 Mon, 17 Dec 2012 20:55:34 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201212172055.qBHKtYgX070163@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 17 Dec 2012 20:55:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244365 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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: Mon, 17 Dec 2012 20:55:34 -0000

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