On Tue, Dec 6, 2011 at 2:29 PM, Jesse Gross <je...@nicira.com> wrote: > On Tue, Dec 6, 2011 at 12:45 PM, Pravin B Shelar <pshe...@nicira.com> wrote: >> Signed-off-by: Pravin B Shelar <pshe...@nicira.com> >> --- >> datapath/linux/compat/include/linux/ipv6.h | 8 -------- >> datapath/linux/compat/include/linux/jiffies.h | 2 ++ >> datapath/linux/compat/include/net/ipv6.h | 13 +++++++++++++ >> 3 files changed, 15 insertions(+), 8 deletions(-) >> create mode 100644 datapath/linux/compat/include/net/ipv6.h > > You need to add the new net/ipv6.h file to datapath/linux/Modules.mk, > otherwise it won't build. ok.
> >> diff --git a/datapath/linux/compat/include/linux/jiffies.h >> b/datapath/linux/compat/include/linux/jiffies.h >> index a64f226..7723c1c 100644 >> --- a/datapath/linux/compat/include/linux/jiffies.h >> +++ b/datapath/linux/compat/include/linux/jiffies.h >> @@ -13,12 +13,14 @@ >> (typecheck(__u64, a) && \ >> typecheck(__u64, b) && \ >> ((__s64)(b) - (__s64)(a) < 0)) >> +#undef time_before64 >> #define time_before64(a, b) time_after64(b, a) >> >> #define time_after_eq64(a, b) \ >> (typecheck(__u64, a) && \ >> typecheck(__u64, b) && \ >> ((__s64)(a) - (__s64)(b) >= 0)) >> +#undef time_before_eq64 >> #define time_before_eq64(a, b) time_after_eq64(b, a) >> >> #endif /* linux kernel < 2.6.19 */ > > I'm somewhat surprised at this because this code is pretty old so I > would have thought that we would have run into it before. > I don't see this in mainline kernel. I think it was added in recent RH update. > If the problem is that there are duplicate definitions then I think we > could just use an #ifdef as a better method to guard than a version > check and undefinition. We could actually do that with everything in > this file. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
