diff options
| author | Joe Stringer <joe@ovn.org> | 2017-05-03 11:53:29 -0700 |
|---|---|---|
| committer | Joe Stringer <joe@ovn.org> | 2017-05-03 16:09:04 -0700 |
| commit | 56ec5593b4717d32ea591861b086facc7cd97b4a (patch) | |
| tree | cdbb1cc5d62ea1ed697b323648fc02d5458d5265 /acinclude.m4 | |
| parent | 9c463631e81456dd6b280a19a2e250e4ed3c1b29 (diff) | |
| download | openvswitch-56ec5593b4717d32ea591861b086facc7cd97b4a.tar.gz | |
datapath: Remove untracked CT on newer kernels.
Upstream commits cc41c84b7e7f ("netfilter: kill the fake untracked
conntrack objects") and ab8bc7ed864b ("netfilter: remove
nf_ct_is_untracked") removed the 'untracked' conntrack objects and
functions. The latter commit removes the usage of nf_ct_is_untracked()
from OVS. However, older kernels still have a representation of
'untracked' CT objects so the code needs to remain until the kernel
support is bumped to Linux 4.12 or newer. Introduce a macro to detect
this symbol and wrap these lines in the macro check.
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Greg Rose <gvrose8192@gmail.com>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index dbe03bc83..d9a8a5837 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -541,6 +541,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_NF_CT_GET_TUPLEPR_TAKES_STRUCT_NET])]) OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack.h], [nf_ct_set]) + OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack.h], + [nf_ct_is_untracked]) OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_zones.h], [nf_ct_zone_init]) OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_labels.h], |