From: Justin Pettit <jpettit@nicira.com>
Date: Mon, 17 May 2010 20:57:29 +0000 (-0700)
Subject: Don't define "skb_dst_drop" if other skb_dst accessor funcs are defined
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cbd4a4ee098426aef07fb20cc322416e293884f;p=openvswitch

Don't define "skb_dst_drop" if other skb_dst accessor funcs are defined

When "skb_dst" is included in the kernel sources, don't redefine
"skb_dst_drop", which is defined in dst.h.
---

diff --git a/datapath/linux-2.6/compat-2.6/include/net/dst.h b/datapath/linux-2.6/compat-2.6/include/net/dst.h
index edb0f75e..e51ac1d6 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/dst.h
+++ b/datapath/linux-2.6/compat-2.6/include/net/dst.h
@@ -3,8 +3,7 @@
 
 #include_next <net/dst.h>
 
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+#ifndef HAVE_SKB_DST_ACCESSOR_FUNCS
 
 static inline void skb_dst_drop(struct sk_buff *skb)
 {
@@ -13,6 +12,6 @@ static inline void skb_dst_drop(struct sk_buff *skb)
 	skb->dst = 0UL;
 }
 
-#endif /* linux kernel < 2.6.31 */
+#endif
 
 #endif