From: Gao Feng <[email protected]>
Upstream commit:
commit 440534d3c56be04abfb26850ee882d19d223557a
Author: Gao Feng <[email protected]>
Date: Mon Jul 9 18:06:33 2018 +0800
netfilter: Remove useless param helper of nf_ct_helper_ext_add
The param helper of nf_ct_helper_ext_add is useless now, then remove
it now.
Signed-off-by: Gao Feng <[email protected]>
Signed-off-by: Pablo Neira Ayuso <[email protected]>
This patch backports the above upstream patch to OVS.
Cc: Gao Feng <[email protected]>
Signed-off-by: Yifeng Sun <[email protected]>
Acked-by: Yi-Hung Wei <[email protected]>
---
v1->v2: Rebase previous patch's changes.
acinclude.m4 | 3 +++
.../linux/compat/include/net/netfilter/nf_conntrack_helper.h | 10 ++++++++++
2 files changed, 13 insertions(+)
diff --git a/acinclude.m4 b/acinclude.m4
index 4f9aebc325ba..878c2f6d40f2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -936,6 +936,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
[OVS_DEFINE([HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE])])
OVS_GREP_IFELSE([$KSRC/include/net/ipv6_frag.h], [IP6_DEFRAG_CONNTRACK_IN],
[OVS_DEFINE([HAVE_IPV6_FRAG_H])])
+ OVS_FIND_PARAM_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_helper.h],
+ [nf_ct_helper_ext_add], [nf_conntrack_helper],
+ [OVS_DEFINE([HAVE_NF_CT_HELPER_EXT_ADD_TAKES_HELPER])])
if cmp -s datapath/linux/kcompat.h.new \
datapath/linux/kcompat.h >/dev/null 2>&1; then
diff --git a/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h
b/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h
index 19c35cd95f6f..b6a3d0bf75b3 100644
--- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h
+++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h
@@ -9,4 +9,14 @@ static inline void nf_conntrack_helper_put(struct
nf_conntrack_helper *helper) {
}
#endif
+#ifndef HAVE_NF_CT_HELPER_EXT_ADD_TAKES_HELPER
+static inline struct nf_conn_help *
+rpl_nf_ct_helper_ext_add(struct nf_conn *ct,
+ struct nf_conntrack_helper *helper, gfp_t gfp)
+{
+ return nf_ct_helper_ext_add(ct, gfp);
+}
+#define nf_ct_helper_ext_add rpl_nf_ct_helper_ext_add
+#endif /* HAVE_NF_CT_HELPER_EXT_ADD_TAKES_HELPER */
+
#endif /* _NF_CONNTRACK_HELPER_WRAPPER_H */
--
2.7.4
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
