From 240388d2df920e2526c294f2d5e9bd4953084921 Mon Sep 17 00:00:00 2001 From: hiren Date: Fri, 19 Jun 2015 19:36:21 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.freebsd.org/base/stable/10@284603 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/netinet/tcp_input.c | 1 + sys/netinet/tcp_syncache.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8420eb33c..7918252c6 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -876,6 +876,7 @@ tcp_input(struct mbuf *m, int off0) ((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 diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 52614d586..9896788f4 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -725,6 +725,7 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) */ if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { inp->inp_flowid = m->m_pkthdr.flowid; + inp->inp_flowtype = M_HASHTYPE_GET(m); } /* -- 2.45.0