diff options
| author | Yifeng Sun <pkusunyifeng@gmail.com> | 2019-05-10 12:30:08 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-05-10 12:57:36 -0700 |
| commit | 945d6d1c119af9e720c28fdfe3e303bfde0b29da (patch) | |
| tree | 59cab88a35b57bb785eea9a707a2b9ac05bf06b4 /datapath/linux/compat | |
| parent | b718aa1076d1961654a8e55fa1ad8755edb43c12 (diff) | |
| download | openvswitch-945d6d1c119af9e720c28fdfe3e303bfde0b29da.tar.gz | |
datapath: Handle removal of nf_conntrack_l3proto.h
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.
Tested-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'datapath/linux/compat')
| -rw-r--r-- | datapath/linux/compat/nf_conntrack_proto.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/datapath/linux/compat/nf_conntrack_proto.c b/datapath/linux/compat/nf_conntrack_proto.c index 4ac66f61c..fe291dbf2 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 |