Patchwork datapath: Fix build breakage on kernel 2.6.40

login
register
mail settings
Submitter Zhiyong Wu
Date Dec. 5, 2011, 2:33 a.m.
Message ID <1323052394-12711-1-git-send-email-zwu.kernel@gmail.com>
Download mbox | patch
Permalink /patch/129215/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Zhiyong Wu - Dec. 5, 2011, 2:33 a.m.
Today i played with openvswitch on my workstation with kernel 2.6.40 and found that it break when i built. The
+issue is introduced by commit ceb176fdb72bb7ce90debc66e1eeb1d25823d30a

Below is the error log:

from /home/zwu/work/virt/openvswitch/datapath/linux/genetlink-brcompat.c:10:
/home/zwu/work/virt/openvswitch/datapath/linux/compat/include/linux/skbuff.h:243:20: error: redefinition of
+‘skb_reset_mac_len’
include/linux/skbuff.h:1259:20: note: previous definition of ‘skb_reset_mac_len’ was here
make[5]: *** [/home/zwu/work/virt/openvswitch/datapath/linux/genetlink-brcompat.o] Error 1
make[4]: *** [_module_/home/zwu/work/virt/openvswitch/datapath/linux] Error 2
make[4]: Leaving directory `/usr/src/kernels/2.6.40.6-0.fc15.x86_64'
make[3]: *** [default] Error 2
make[3]: Leaving directory `/home/zwu/work/virt/openvswitch/datapath/linux'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/zwu/work/virt/openvswitch/datapath'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/zwu/work/virt/openvswitch'
make: *** [all] Error 2


Signed-off-by: Zhi Yong Wu <zwu.kernel@gmail.com>
---
 datapath/linux/compat/include/linux/skbuff.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Jesse Gross - Dec. 5, 2011, 5:32 p.m.
On Sun, Dec 4, 2011 at 6:33 PM, Zhi Yong Wu <zwu.kernel@gmail.com> wrote:
> Today i played with openvswitch on my workstation with kernel 2.6.40 and found that it break when i built. The
> +issue is introduced by commit ceb176fdb72bb7ce90debc66e1eeb1d25823d30a
>
> Below is the error log:
>
> from /home/zwu/work/virt/openvswitch/datapath/linux/genetlink-brcompat.c:10:
> /home/zwu/work/virt/openvswitch/datapath/linux/compat/include/linux/skbuff.h:243:20: error: redefinition of
> +‘skb_reset_mac_len’
> include/linux/skbuff.h:1259:20: note: previous definition of ‘skb_reset_mac_len’ was here
> make[5]: *** [/home/zwu/work/virt/openvswitch/datapath/linux/genetlink-brcompat.o] Error 1
> make[4]: *** [_module_/home/zwu/work/virt/openvswitch/datapath/linux] Error 2
> make[4]: Leaving directory `/usr/src/kernels/2.6.40.6-0.fc15.x86_64'
> make[3]: *** [default] Error 2
> make[3]: Leaving directory `/home/zwu/work/virt/openvswitch/datapath/linux'
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory `/home/zwu/work/virt/openvswitch/datapath'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/home/zwu/work/virt/openvswitch'
> make: *** [all] Error 2
>
>
> Signed-off-by: Zhi Yong Wu <zwu.kernel@gmail.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h
index 311bfdb..96d8012 100644
--- a/datapath/linux/compat/include/linux/skbuff.h
+++ b/datapath/linux/compat/include/linux/skbuff.h
@@ -239,7 +239,7 @@  static inline struct page *skb_frag_page(const skb_frag_t *frag)
 }
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,40)
 static inline void skb_reset_mac_len(struct sk_buff *skb)
 {
 	skb->mac_len = skb->network_header - skb->mac_header;