From owner-svn-src-all@FreeBSD.ORG  Fri Jun 19 19:36:23 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1DA21913;
 Fri, 19 Jun 2015 19:36:23 +0000 (UTC)
 (envelope-from hiren@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B263238;
 Fri, 19 Jun 2015 19:36:23 +0000 (UTC)
 (envelope-from hiren@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JJaMYj013793;
 Fri, 19 Jun 2015 19:36:22 GMT (envelope-from hiren@FreeBSD.org)
Received: (from hiren@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JJaMBf013788;
 Fri, 19 Jun 2015 19:36:22 GMT (envelope-from hiren@FreeBSD.org)
Message-Id: <201506191936.t5JJaMBf013788@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hiren set sender to
 hiren@FreeBSD.org using -f
From: Hiren Panchasara <hiren@FreeBSD.org>
Date: Fri, 19 Jun 2015 19:36:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284603 - stable/10/sys/netinet
X-SVN-Group: stable-10
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.20
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: Fri, 19 Jun 2015 19:36:23 -0000

Author: hiren
Date: Fri Jun 19 19:36:21 2015
New Revision: 284603
URL: https://svnweb.freebsd.org/changeset/base/284603

Log:
  MFC r266420 (by adrian)
  
  Ensure that the flowid hashtype is assigned to the inp if the flowid
  is also assigned.
  
  Spotted by:	gallatin
  Tested by:	gallatin

Modified:
  stable/10/sys/netinet/tcp_input.c
  stable/10/sys/netinet/tcp_syncache.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/tcp_input.c
==============================================================================
--- stable/10/sys/netinet/tcp_input.c	Fri Jun 19 18:57:36 2015	(r284602)
+++ stable/10/sys/netinet/tcp_input.c	Fri Jun 19 19:36:21 2015	(r284603)
@@ -876,6 +876,7 @@ findpcb:
 	    ((inp->inp_socket == NULL) ||
 	    (inp->inp_socket->so_options & SO_ACCEPTCONN) == 0)) {
 		inp->inp_flowid = m->m_pkthdr.flowid;
+		inp->inp_flowtype = M_HASHTYPE_GET(m);
 	}
 #ifdef IPSEC
 #ifdef INET6

Modified: stable/10/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/10/sys/netinet/tcp_syncache.c	Fri Jun 19 18:57:36 2015	(r284602)
+++ stable/10/sys/netinet/tcp_syncache.c	Fri Jun 19 19:36:21 2015	(r284603)
@@ -725,6 +725,7 @@ syncache_socket(struct syncache *sc, str
 	 */
 	if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
 		inp->inp_flowid = m->m_pkthdr.flowid;
+		inp->inp_flowtype = M_HASHTYPE_GET(m);
 	}
 
 	/*