summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorJesse Gross <jesse@kernel.org>2016-03-21 11:39:38 -0700
committerJesse Gross <jesse@kernel.org>2016-03-21 12:53:19 -0700
commit2b64e8fc1bd56f3631f26ea82e9233fce61d69c9 (patch)
treeeb9bdf8f19a7293bbcaca35aa3988a1914d71a85 /acinclude.m4
parente32c1f7c0d65fe0ab99b61654ba0df393c42b88f (diff)
downloadopenvswitch-2b64e8fc1bd56f3631f26ea82e9233fce61d69c9.tar.gz
datapath: Check for sock argument to v6ops->fragment.
Ubuntu 3.13.0-83-generic has backported a patch that adds an intermediate version of the v6ops->fragment function that doesn't seem to ever been part of a released upstream kernel. This version is missing the sock argument to the fragment function. Since we already have a backported version of the function from a newer kernel, this simply ignores the version that Ubuntu is now making available and continues to use the OVS version, similar to what it was doing before. Reported-by: Zoltán Balogh <zoltan.balogh@ericsson.com> Reported-by: Aaron Rosen <aaronorosen@gmail.com> Reported-by: Russell Bryant <russell@ovn.org> Signed-off-by: Jesse Gross <jesse@kernel.org> Acked-by: Russell Bryant <russell@ovn.org>
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 74f049402..f345c31bd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -393,7 +393,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
OVS_GREP_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hookfn.*nf_hook_ops],
[OVS_DEFINE([HAVE_NF_HOOKFN_ARG_OPS])])
OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netfilter_ipv6.h], [nf_ipv6_ops],
- [fragment], [OVS_DEFINE([HAVE_NF_IPV6_OPS_FRAGMENT])])
+ [fragment.*sock], [OVS_DEFINE([HAVE_NF_IPV6_OPS_FRAGMENT])])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack.h],
[tmpl_alloc.*conntrack_zone],