Re: [ovs-dev] [PATCH 1/7 v3] datapath: Handle removal of nf_conntrack_l3proto.h

[Darrell Ball via dev]

Looks a little odd: 'HAVE_NF_CONNTRACK_L3PROATO_H'

You may want a follow up patch: 
s/HAVE_NF_CONNTRACK_L3PROATO_H/HAVE_NF_CONNTRACK_L3PROTO_H



On 5/10/19, 12:31 PM, "ovs-dev-boun...@openvswitch.org on behalf of Yifeng 
Sun" <ovs-dev-boun...@openvswitch.org on behalf of pkusunyif...@gmail.com> 
wrote:

    Upstream kernel commit a0ae2562 ("netfilter: conntrack: remove l3proto
    abstraction") removed header file net/netfilter/nf_conntrack_l3proto.h.
    This patch detects it and fixes compilation errors of OVS on 4.19+ kernels.
    
    Signed-off-by: Yifeng Sun <pkusunyif...@gmail.com>
    Acked-by: Yi-Hung Wei <yihung....@gmail.com>
    ---
     acinclude.m4                               | 3 +++
     datapath/linux/compat/nf_conntrack_proto.c | 2 ++
     2 files changed, 5 insertions(+)
    
    diff --git a/acinclude.m4 b/acinclude.m4
    index b532a4579266..c9b744db0b94 100644
    --- a/acinclude.m4
    +++ b/acinclude.m4
    @@ -926,6 +926,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
                       [OVS_DEFINE([HAVE_KVMALLOC_ARRAY])])
       OVS_GREP_IFELSE([$KSRC/include/linux/mm.h], [kvmalloc_node],
                       [OVS_DEFINE([HAVE_KVMALLOC_NODE])])
    +  OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_l3proto.h],
    +                  [nf_conntrack_l3proto],
    +                  [OVS_DEFINE([HAVE_NF_CONNTRACK_L3PROATO_H])])
     
       if cmp -s datapath/linux/kcompat.h.new \
                 datapath/linux/kcompat.h >/dev/null 2>&1; then
    diff --git a/datapath/linux/compat/nf_conntrack_proto.c 
b/datapath/linux/compat/nf_conntrack_proto.c
    index 4ac66f61c70d..fe291dbf25e1 100644
    --- a/datapath/linux/compat/nf_conntrack_proto.c
    +++ b/datapath/linux/compat/nf_conntrack_proto.c
    @@ -1,7 +1,9 @@
     #include <linux/types.h>
     
     #include <net/netfilter/nf_conntrack.h>
    +#ifdef HAVE_NF_CONNTRACK_L3PROATO_H
     #include <net/netfilter/nf_conntrack_l3proto.h>
    +#endif
     
     /*
      * Upstream net-next commmit 7e35ec0e8044
    -- 
    2.7.4
    
    _______________________________________________
    dev mailing list
    d...@openvswitch.org
    
https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmail.openvswitch.org%2Fmailman%2Flistinfo%2Fovs-dev&amp;data=02%7C01%7Cdball%40vmware.com%7C0ca3d8a2fbb1444db8a708d6d57e1131%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C636931134777785746&amp;sdata=%2BjvNwhHQvw0bidum9%2Fw%2F1VTWASDZzU%2BXSBs5KkkVkew%3D&amp;reserved=0
    

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