diff options
| author | dim <dim@FreeBSD.org> | 2014-12-01 13:14:39 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-12-01 13:14:39 +0000 |
| commit | 78c1f8fbf46602fa3a316af9a8cb3221b76a24b2 (patch) | |
| tree | d5fa3f2bfaaf53d3473a85d63e4b7770e9d6c840 /sys/net/netisr.c | |
| parent | d60f78e7aa0d70dfa92ba5767f7a482dbbe0caba (diff) | |
| download | FreeBSD-src-78c1f8fbf46602fa3a316af9a8cb3221b76a24b2.zip FreeBSD-src-78c1f8fbf46602fa3a316af9a8cb3221b76a24b2.tar.gz | |
Merge ^/head r275262 through r275363.
Diffstat (limited to 'sys/net/netisr.c')
| -rw-r--r-- | sys/net/netisr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/net/netisr.c b/sys/net/netisr.c index 049bbf1..178c3cb 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -682,12 +682,13 @@ netisr_select_cpuid(struct netisr_proto *npp, u_int dispatch_policy, } if (policy == NETISR_POLICY_FLOW) { - if (!(m->m_flags & M_FLOWID) && npp->np_m2flow != NULL) { + if (M_HASHTYPE_GET(m) == M_HASHTYPE_NONE && + npp->np_m2flow != NULL) { m = npp->np_m2flow(m, source); if (m == NULL) return (NULL); } - if (m->m_flags & M_FLOWID) { + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { *cpuidp = netisr_default_flow2cpu(m->m_pkthdr.flowid); return (m); |
