diff mbox

[ovs-dev,08/13] compat: Detect and use __skb_dst_copy().

Message ID 1452563641-33507-9-git-send-email-joe@ovn.org
State Accepted
Headers show

Commit Message

Joe Stringer Jan. 12, 2016, 1:53 a.m. UTC 
Signed-off-by: Joe Stringer <joe@ovn.org>
---
 acinclude.m4                            | 1 +
 datapath/linux/compat/include/net/dst.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/acinclude.m4 b/acinclude.m4
index 2d6653d1b8dd..5c758a641e1e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -472,6 +472,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 de74c9383b8b..5ec3d307b7b4 100644
--- 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;