diff options
author | Greg Rose <gvrose8192@gmail.com> | 2017-04-27 16:13:12 -0700 |
---|---|---|
committer | Joe Stringer <joe@ovn.org> | 2017-04-28 14:36:34 -0700 |
commit | 802d12b6049b59fc69bc6f4ce4b3089b29cb7da1 (patch) | |
tree | 6b27fc92e76e39ea00b051dca93f46b927ee8500 /acinclude.m4 | |
parent | af7535e7dbeb9a0f4b75fe1704c98fa7589924ca (diff) | |
download | openvswitch-802d12b6049b59fc69bc6f4ce4b3089b29cb7da1.tar.gz |
compat: Fix build error in kernels 4.10
Use the acinclude.m4 configuration file to check for the net parameter
that was added to the ipv4 and ipv6 frags init functions in the 4.10
Linux kernel to check whether DEFRAG_ENABLE_TAKES_NET should be set and
then check for that at compile time.
This is an alternative solution patch for the issue reported by Raymond
Burkholder and the patch submitted by Guoshuai Li.
[Committer notes]
Squash in "acinclude.m4: Add check for struct net parameter" which
provides the HAVE_DEFRAG_ENABLE_TAKES_NET.
Reported-by: Raymond Burkholder <ray@oneunified.net>
CC: Guoshuai Li <ligs@dtdream.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Joe Stringer <joe@ovn.org>
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 9f8e30d9b..7e4acc9ba 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -703,7 +703,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/protocol.h], [udp_add_offload], [net], [OVS_DEFINE([HAVE_UDP_ADD_OFFLOAD_TAKES_NET])]) - + OVS_FIND_PARAM_IFELSE([$KSRC/include/net/netfilter/ipv6/nf_defrag_ipv6.h], + [nf_defrag_ipv6_enable], [net], + [OVS_DEFINE([HAVE_DEFRAG_ENABLE_TAKES_NET])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then |