diff options
author | hiren <hiren@FreeBSD.org> | 2015-06-19 19:36:21 +0000 |
---|---|---|
committer | hiren <hiren@FreeBSD.org> | 2015-06-19 19:36:21 +0000 |
commit | 4aefd42d20938c97e197e74118a18aaef1b971ee (patch) | |
tree | a216732547f9aab8dd685e29fa6431b21eadba63 /sys | |
parent | 82356d356ac4f81176a729f99d9386839e4bcabc (diff) | |
download | FreeBSD-src-4aefd42d20938c97e197e74118a18aaef1b971ee.zip FreeBSD-src-4aefd42d20938c97e197e74118a18aaef1b971ee.tar.gz |
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
Diffstat (limited to 'sys')
-rw-r--r-- | sys/netinet/tcp_input.c | 1 | ||||
-rw-r--r-- | sys/netinet/tcp_syncache.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8420eb3..7918252 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -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 diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 52614d5..9896788 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); } /* |