This was causing build failures on debian wheezy. Check for the feature
rather than the version.
Signed-off-by: Joe Stringer <joestrin...@nicira.com>
---
acinclude.m4 | 1 +
datapath/linux/compat/include/linux/skbuff.h | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index e6bed37..fdcdf44 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -288,6 +288,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [__skb_fill_page_desc])
OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_reset_mac_len])
OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_unclone])
+ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_orphan_frags])
OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool],
[OVS_DEFINE([HAVE_BOOL_TYPE])])
diff --git a/datapath/linux/compat/include/linux/skbuff.h
b/datapath/linux/compat/include/linux/skbuff.h
index cc2bf0e..714c955 100644
--- a/datapath/linux/compat/include/linux/skbuff.h
+++ b/datapath/linux/compat/include/linux/skbuff.h
@@ -243,12 +243,12 @@ static inline int skb_unclone(struct sk_buff *skb, gfp_t
pri)
}
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0)
+#ifndef HAVE_SKB_ORPHAN_FRAGS
static inline int skb_orphan_frags(struct sk_buff *skb, gfp_t gfp_mask)
{
return 0;
}
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,6,0) */
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
#define __skb_get_rxhash rpl__skb_get_rxhash
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
