Re: [ovs-dev] [PATCH] acinclude: Add missing define

2017-09-21 Thread Greg Rose

On 09/21/2017 08:35 AM, Greg Rose wrote:

The final line of a conditional search for the nf_conntrack_helper_put
function does not actually define HAVE_NF_CONNTRACK_HELPER_PUT used
in datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h.

Signed-off-by: Greg Rose 


Also needs a "Fixes" tag

Fixes: ac8e3c6d14d2 ("datapath: introduce nf_conntrack_helper_put function")

I can send a V2 with that tag or it can be added on push.  Let me know...

- Greg


---
  acinclude.m4 | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index aeb594a..ef4a74a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -766,7 +766,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
OVS_FIND_FIELD_IFELSE([$KSRC/include/net/vxlan.h], [vxlan_dev], [cfg],
  [OVS_DEFINE([HAVE_VXLAN_DEV_CFG])])
OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_helper.h],
-  [nf_conntrack_helper_put])
+  [nf_conntrack_helper_put],
+  [OVS_DEFINE(HAVE_NF_CONNTRACK_HELPER_PUT)])
  
if cmp -s datapath/linux/kcompat.h.new \

  datapath/linux/kcompat.h >/dev/null 2>&1; then



___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


[ovs-dev] [PATCH] acinclude: Add missing define

2017-09-21 Thread Greg Rose
The final line of a conditional search for the nf_conntrack_helper_put
function does not actually define HAVE_NF_CONNTRACK_HELPER_PUT used
in datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h.

Signed-off-by: Greg Rose 
---
 acinclude.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index aeb594a..ef4a74a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -766,7 +766,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_FIND_FIELD_IFELSE([$KSRC/include/net/vxlan.h], [vxlan_dev], [cfg],
 [OVS_DEFINE([HAVE_VXLAN_DEV_CFG])])
   OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_helper.h],
-  [nf_conntrack_helper_put])
+  [nf_conntrack_helper_put],
+  [OVS_DEFINE(HAVE_NF_CONNTRACK_HELPER_PUT)])
 
   if cmp -s datapath/linux/kcompat.h.new \
 datapath/linux/kcompat.h >/dev/null 2>&1; then
-- 
1.8.3.1

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev