git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't define "skb_dst_drop" if other skb_dst accessor funcs are defined
[sliver-openvswitch.git]
/
datapath
/
linux-2.6
/
compat-2.6
/
include
/
net
/
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
edb0f75
..
e51ac1d
100644
(file)
--- 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_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)
{
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;
}
skb->dst = 0UL;
}
-#endif
/* linux kernel < 2.6.31 */
+#endif
#endif
#endif