From 1269f7ae5f4bf23205de2cd45220b2382af78393 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 4 Feb 2011 12:35:49 -0800 Subject: datapath: Tolerate backporting of rtnl_link_stats64 (as in RHEL 6). Red Hat Enterprise Linux 6 has a 2.6.32 kernel but it backports the rtnl_link_stats64 structure that was introduced in 2.6.35, so we need to check whether it was defined instead of just guessing based on the kernel version number. Build-tested only, on 2.6.32-71.14.1.el6 (RHEL 6), linux-2.6.18-128.1.6.el5.xs5.5.0.496.101 (XenServer 5.5.0), 2.6.18-128.1.6.el5.xs5.5.0.505.1024xen (XenServer 5.5.0 update 1), and upstream 2.6.18, 2.6.26, 2.6.29, 2.6.33, 2.6.34, 2.6.36, all for i386, plus 2.6.36 for x86-64. My machine's userspace headers have but not rtnl_link_stats64. Jesse Gross tested the case where has rtnl_link_stats64, on Ubuntu 10.10. Reported-by: Geoff White Tested-by: Jesse Gross --- acinclude.m4 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index 0cd14272d..fed950bd4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -204,6 +204,8 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_get_be16]) OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_find_nested]) + OVS_GREP_IFELSE([$KSRC26/include/linux/if_link.h], [rtnl_link_stats64]) + OVS_CHECK_LOG2_H if cmp -s datapath/linux-2.6/kcompat.h.new \ -- cgit v1.2.1