From: Zhi Yong Wu Date: Mon, 5 Dec 2011 02:33:14 +0000 (+0800) Subject: datapath: Fix build breakage on kernel 2.6.40 X-Git-Tag: sliver-openvswitch-0.1-1~592 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c0338a5ccbe7a1133b833bb2675b400619f32190;p=sliver-openvswitch.git datapath: Fix build breakage on kernel 2.6.40 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 Signed-off-by: Jesse Gross --- diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h index 311bfdbc6..96d80124f 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;