diff options
author | David S. Miller | 2018-11-12 02:57:54 +0100 |
---|---|---|
committer | David S. Miller | 2018-11-12 02:57:54 +0100 |
commit | 2b9b7502dfcb6169dbf3359702953bf756b4e273 (patch) | |
tree | 58ab22096d49de6a0e049cf1267edc34b82916dc /net/core/flow_dissector.c | |
parent | PCI: add USR vendor id and use it in r8169 and w6692 driver (diff) | |
parent | Linux 4.20-rc2 (diff) | |
download | kernel-qcow2-linux-2b9b7502dfcb6169dbf3359702953bf756b4e273.tar.gz kernel-qcow2-linux-2b9b7502dfcb6169dbf3359702953bf756b4e273.tar.xz kernel-qcow2-linux-2b9b7502dfcb6169dbf3359702953bf756b4e273.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/core/flow_dissector.c')
-rw-r--r-- | net/core/flow_dissector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 56d1e9b73142..2e8d91e54179 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -1165,8 +1165,8 @@ ip_proto_again: break; } - if (dissector_uses_key(flow_dissector, - FLOW_DISSECTOR_KEY_PORTS)) { + if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS) && + !(key_control->flags & FLOW_DIS_IS_FRAGMENT)) { key_ports = skb_flow_dissector_target(flow_dissector, FLOW_DISSECTOR_KEY_PORTS, target_container); |