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);
}
/*
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
