Patch fixes following build failure:- make[4]: Entering directory `/usr/src/kernels/2.6.32-358.18.1.el6.x86_64' CC [M] openvswitch/datapath/linux/actions.o In file included from openvswitch/datapath/linux/actions.c:21: openvswitch/datapath/linux/compat/include/linux/skbuff.h:273: error: redefinition of ???__skb_fill_page_desc??? include/linux/skbuff.h:1123: note: previous definition of ???__skb_fill_page_desc??? was here -----
Signed-off-by: Pravin B Shelar <[email protected]> --- 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 2ca9311..321b3b0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -256,6 +256,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_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 41ec951..d1224ac 100644 --- a/datapath/linux/compat/include/linux/skbuff.h +++ b/datapath/linux/compat/include/linux/skbuff.h @@ -269,7 +269,7 @@ void skb_zerocopy(struct sk_buff *to, const struct sk_buff *from, int len, #define skb_has_frag_list skb_has_frags #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) +#ifndef HAVE___SKB_FILL_PAGE_DESC static inline void __skb_fill_page_desc(struct sk_buff *skb, int i, struct page *page, int off, int size) { -- 1.7.1
_______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
