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

Jesse Gross jesse at nicira.com
Sun Dec 22 22:38:40 UTC 2013


On Sun, Dec 22, 2013 at 3:12 PM, Pravin B Shelar <pshelar at nicira.com> wrote:
> diff --git a/datapath/linux/compat/gre.c b/datapath/linux/compat/gre.c
> index f35f11f..5b2a892 100644
> --- a/datapath/linux/compat/gre.c
> +++ b/datapath/linux/compat/gre.c
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
> +static const struct net_protocol net_gre_protocol = {
> +       .handler     = gre_rcv,
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
> +       .netns_ok    = 1,
> +#endif

I guess we can drop this version check now.

>  #endif /* CONFIG_NET_IPGRE_DEMUX */
> diff --git a/datapath/linux/compat/include/net/gre.h b/datapath/linux/compat/include/net/gre.h
> index 91fb7af..d302ac2 100644
> --- a/datapath/linux/compat/include/net/gre.h
> +++ b/datapath/linux/compat/include/net/gre.h
> +#ifndef HAVE_GRE_CISCO_REGISTER
>
>  #define GREPROTO_CISCO         0
>  #define GREPROTO_MAX           2

I think these constants need to be moved to gre.c since they are
defined in 2.6.37+.



More information about the dev mailing list