summaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-06-23 12:33:24 -0700
committerJakub Kicinski <kuba@kernel.org>2022-06-23 12:33:24 -0700
commit93817be8b62c7fa1f1bdc3e8c037a73a60026be9 (patch)
tree873c207abc783edb4ead73b2b3a8a9b105f94420 /net/openvswitch
parentccb9bc1dfa444e3541622ccfff135e83d2a569d1 (diff)
parent399bd66e219e331976fe6fa6ab81a023c0c97870 (diff)
downloadlinux-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.tar.gz
linux-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.tar.bz2
linux-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/flow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 372bf54a0ca9..e20d1a973417 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -407,7 +407,7 @@ static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key)
if (flags & IP6_FH_F_FRAG) {
if (frag_off) {
key->ip.frag = OVS_FRAG_TYPE_LATER;
- key->ip.proto = nexthdr;
+ key->ip.proto = NEXTHDR_FRAGMENT;
return 0;
}
key->ip.frag = OVS_FRAG_TYPE_FIRST;