datapath: Check for backported skb_orphan_frags().

This was causing build failures on debian wheezy. Check for the feature rather than the version. Signed-off-by: Joe Stringer <[email protected]> Acked-by: Jesse Gross <[email protected]>
little-dude · Apr 29, 2014 · bf52ed4 · bf52ed4
1 parent 82e413d
commit bf52ed4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -262,6 +262,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
@@ -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