diff options
author | Pravin B Shelar <pshelar@nicira.com> | 2013-12-18 10:57:33 -0800 |
---|---|---|
committer | Pravin B Shelar <pshelar@nicira.com> | 2013-12-16 14:56:43 -0800 |
commit | 0aa6fda799596bea3a0103c7fa0d6afe2eaeeea6 (patch) | |
tree | 0c6d00e0782e2b7f0ade174fc3202bfc0f99cb66 /acinclude.m4 | |
parent | 5d386c0613024993566fb3bef13a1e33fa93e91c (diff) | |
download | openvswitch-0aa6fda799596bea3a0103c7fa0d6afe2eaeeea6.tar.gz |
datapath: Fix build failure on RHEL 6.4
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 <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 2ca931114..321b3b026 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]) |