compat: Detect and use __skb_dst_copy().

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>

diff --git a/acinclude.m4 b/acinclude.m4
index 54c6e72..dddbd1c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -471,6 +471,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/net/checksum.h], [csum_unfold])
 
   OVS_GREP_IFELSE([$KSRC/include/net/dst.h], [dst_discard_sk])
+  OVS_GREP_IFELSE([$KSRC/include/net/dst.h], [__skb_dst_copy])
 
   OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [genl_has_listeners])
   OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [mcgrp_offset])

diff --git a/datapath/linux/compat/include/net/dst.h b/datapath/linux/compat/include/net/dst.h
index de74c93..5ec3d30 100644 (file)
--- a/datapath/linux/compat/include/net/dst.h
+++ b/datapath/linux/compat/include/net/dst.h
@@ -42,7 +42,7 @@ static inline void skb_dst_set_noref(struct sk_buff *skb,
                                     struct dst_entry *dst) { }
 static inline void dst_init_metrics(struct dst_entry *dst, const u32 *metrics,
                                    bool read_only) { }
-#elif  LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
+#elif !defined(HAVE___SKB_DST_COPY)
 static inline void __skb_dst_copy(struct sk_buff *nskb, unsigned long refdst)
 {
        nskb->_skb_refdst = refdst;