| Message ID | 1506008129-523-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] acinclude: Add missing define | expand |
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 <gvrose8192@gmail.com> 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 >
On Thu, Sep 21, 2017 at 09:05:47AM -0700, Greg Rose wrote: > 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 <gvrose8192@gmail.com> > > 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... I added it and pushed to master and branch-2.8. Thank you!
On 09/21/2017 10:15 AM, Ben Pfaff wrote: > On Thu, Sep 21, 2017 at 09:05:47AM -0700, Greg Rose wrote: >> 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 <gvrose8192@gmail.com> >> >> 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... > > I added it and pushed to master and branch-2.8. Thank you! > Thanks Ben!
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
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 <gvrose8192@gmail.com> --- acinclude.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)