[ovs-dev] [PATCH] datapath: compat: Configure check GRE DEMUX.

Jesse Gross jesse at nicira.com
Sat Dec 21 17:48:09 UTC 2013


On Fri, Dec 20, 2013 at 8:17 PM, Pravin B Shelar <pshelar at nicira.com> wrote:
> diff --git a/datapath/linux/compat/include/net/gre.h b/datapath/linux/compat/include/net/gre.h
> index 91fb7af..2678af5 100644
> --- a/datapath/linux/compat/include/net/gre.h
> +++ b/datapath/linux/compat/include/net/gre.h
> @@ -4,7 +4,7 @@
>  #include <linux/skbuff.h>
>  #include <net/ip_tunnels.h>
>
> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
> +#ifdef HAVE_GRE_CISCO_REGISTER
>  #include_next <net/gre.h>
>
>  #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) */
> @@ -19,14 +19,14 @@ struct gre_protocol {
>  int gre_add_protocol(const struct gre_protocol *proto, u8 version);
>  int gre_del_protocol(const struct gre_protocol *proto, u8 version);

I think there's a version check for < 2.6.37 missing here. Otherwise,
won't these symbols be duplicated on kernels 2.6.37-3.10?



More information about the dev mailing list