From ac387ef5ce7115f9539104011f0409eb6a1bbe99 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 9 Nov 2010 16:22:24 -0800 Subject: [PATCH] datapath: Fix build on 2.6.18. Build-tested (only) on 2.6.18 from XenServer 5.5.0, 2.6.26, 2.6.29, 2.6.34, and 2.6.36. Signed-off-by: Ben Pfaff --- include/linux/if_link.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 41f1a9cc..6181a5d5 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -1,9 +1,19 @@ #ifndef __LINUX_IF_LINK_WRAPPER_H #define __LINUX_IF_LINK_WRAPPER_H 1 +#include + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) #include_next +#else +/* Before 2.6.19 there was no . Instead all of the types now + * declared there were in . Unfortunately from 2.6.18 + * conflicts badly enough with to break the userspace build. All + * we really need from is struct rtnl_link_stats64, which in + * turn only really needs __u64. */ +#include +#endif -#include #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) /* The main device statistics structure */ struct rtnl_link_stats64 { -- 2.30.2