X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fif_link.h;h=4afc22b66d49cc1000c1698f52fc95c6a23e5330;hb=027f90073af54d394f629f4f091a316b26beec67;hp=41f1a9cc91f60e6f29f1d299cc22863227b8608e;hpb=ec61a01cd8ed73b13ffe042ddff4baf41f6b63e7;p=openvswitch

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 41f1a9cc..4afc22b6 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -1,9 +1,20 @@
 #ifndef __LINUX_IF_LINK_WRAPPER_H
 #define __LINUX_IF_LINK_WRAPPER_H 1
 
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
 #include_next <linux/if_link.h>
+#else
+/* Before 2.6.19 there was no <linux/if_link.h>.  Instead all of the types now
+ * declared there were in <linux/if.h>.  Unfortunately <linux/if.h> from 2.6.18
+ * conflicts badly enough with <net/if.h> to break the userspace build.  All
+ * we really need from <linux/if_link.h> is struct rtnl_link_stats64, which in
+ * turn only really needs __u64.  */
+#include <linux/types.h>
+#include <linux/netlink.h>
+#endif
 
-#include <linux/version.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
 /* The main device statistics structure */
 struct rtnl_link_stats64 {