From: Pravin B Shelar Date: Fri, 20 Dec 2013 22:30:28 +0000 (-0800) Subject: datapath: compat: Fix skb_has_frag_list definition. X-Git-Tag: v2.1.0~58 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=da4bbeb70a38a92e110ffc0b266b7482ba75bdfe;hp=6ec6fa25511666513ee661f457e48c0aeafe32a6;p=cascardo%2Fovs.git datapath: compat: Fix skb_has_frag_list definition. RHEL6-openstack kernel has already replaced skb_has_frags with skb_has_frag_list(). Fix compilation error on RHEL6-openstack. Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- diff --git a/acinclude.m4 b/acinclude.m4 index a7383878e..1509b2e1c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -257,6 +257,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_SKB_WARN_LRO])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [consume_skb]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_frag_page]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_has_frag_list]) 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]) diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h index d1224ac12..de0c56ab9 100644 --- a/datapath/linux/compat/include/linux/skbuff.h +++ b/datapath/linux/compat/include/linux/skbuff.h @@ -265,7 +265,7 @@ void skb_zerocopy(struct sk_buff *to, const struct sk_buff *from, int len, #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) +#ifndef HAVE_SKB_HAS_FRAG_LIST #define skb_has_frag_list skb_has_frags #endif