dst_init_metrics was introduced in v2.6.39 rather than v2.6.35.
Fixes: e23775f20e1a ("datapath: Add support for lwtunnel")
Signed-off-by: Simon Horman <[email protected]>
---
.travis.yml | 1 +
datapath/linux/compat/include/net/dst.h | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 90df67454a22..d6376ff51bd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ env:
- KERNEL=3.10.92
- KERNEL=3.4.110
- KERNEL=3.2.72
+ - KERNEL=2.6.39.4
- KERNEL=2.6.38.8
- KERNEL=2.6.37.6
- KERNEL=2.6.33.20
diff --git a/datapath/linux/compat/include/net/dst.h
b/datapath/linux/compat/include/net/dst.h
index de74c9383b8b..2b7c1c7c2716 100644
--- a/datapath/linux/compat/include/net/dst.h
+++ b/datapath/linux/compat/include/net/dst.h
@@ -40,8 +40,6 @@ static inline void __skb_dst_copy(struct sk_buff *nskb,
unsigned long refdst)
static inline void refdst_drop(unsigned long refdst) { }
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)
static inline void __skb_dst_copy(struct sk_buff *nskb, unsigned long refdst)
{
@@ -51,6 +49,11 @@ static inline void __skb_dst_copy(struct sk_buff *nskb,
unsigned long refdst)
}
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
+static inline void dst_init_metrics(struct dst_entry *dst, const u32 *metrics,
+ bool read_only) { }
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
static inline void dst_entries_add(struct dst_ops *ops, int count)
{
--
2.1.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
