From: Joe Stringer Date: Mon, 28 Apr 2014 01:59:25 +0000 (+1200) Subject: datapath: Check for backported skb_orphan_frags(). X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~66 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=1edc458d61d9846b743310d9dd37ad181b013e5f 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 Acked-by: Jesse Gross --- diff --git a/acinclude.m4 b/acinclude.m4 index e6bed37c3..fdcdf4491 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 cc2bf0e1b..714c955be 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