svn commit: r266420 - head/sys/netinet

[Adrian Chadd]

Author: adrian
Date: Sun May 18 22:34:06 2014
New Revision: 266420
URL: http://svnweb.freebsd.org/changeset/base/266420

Log:
  Ensure that the flowid hashtype is assigned to the inp if the flowid
  is also assigned.

Modified:
  head/sys/netinet/tcp_input.c
  head/sys/netinet/tcp_syncache.c

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c	Sun May 18 22:32:04 2014	(r266419)
+++ head/sys/netinet/tcp_input.c	Sun May 18 22:34:06 2014	(r266420)
@@ -905,6 +905,7 @@ findpcb:
 		inp->inp_flags |= INP_HW_FLOWID;
 		inp->inp_flags &= ~INP_SW_FLOWID;
 		inp->inp_flowid = m->m_pkthdr.flowid;
+		inp->inp_flowtype = M_HASHTYPE_GET(m);
 	}
 #ifdef IPSEC
 #ifdef INET6

Modified: head/sys/netinet/tcp_syncache.c
==============================================================================
--- head/sys/netinet/tcp_syncache.c	Sun May 18 22:32:04 2014	(r266419)
+++ head/sys/netinet/tcp_syncache.c	Sun May 18 22:34:06 2014	(r266420)
@@ -718,6 +718,7 @@ syncache_socket(struct syncache *sc, str
 		inp->inp_flags |= INP_HW_FLOWID;
 		inp->inp_flags &= ~INP_SW_FLOWID;
 		inp->inp_flowid = m->m_pkthdr.flowid;
+		inp->inp_flowtype = M_HASHTYPE_GET(m);
 	}
 
 	/*