On Sat, Dec 21, 2013 at 6:11 PM, Pravin Shelar <pshe...@nicira.com> wrote:
> On Sat, Dec 21, 2013 at 9:48 AM, Jesse Gross <je...@nicira.com> wrote:
>> On Fri, Dec 20, 2013 at 8:17 PM, Pravin B Shelar <pshe...@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?
>
> I am not sure why would be duplicate symbol. This is declaration.
Hmm, OK, I see now that we aren't including the original gre.h and are
replacing it with our own. However, don't we then have a problem on
3.10 with the symbols that are conditionally included for that kernel?
I think the comment on the #else part of #ifdef
HAVE_GRE_CISCO_REGISTER is also out of date now.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
