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 <pshe...@nicira.com>
---
acinclude.m4 | 1 +
datapath/linux/compat/include/linux/skbuff.h | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index a738387..1509b2e 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 d1224ac..de0c56a 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
--
1.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
