diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-02-04 12:35:49 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-02-04 12:36:21 -0800 |
| commit | 1269f7ae5f4bf23205de2cd45220b2382af78393 (patch) | |
| tree | c34356f33f39ad797ab262015fdeac2ce84e2818 /acinclude.m4 | |
| parent | 5e5ce0741f8b7dbee54d1407e7b0af5ee813b38f (diff) | |
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 <linux/if_link.h> but not
rtnl_link_stats64. Jesse Gross tested the case where <linux/if_link.h>
has rtnl_link_stats64, on Ubuntu 10.10.
Reported-by: Geoff White <gwhite@nicira.com>
Tested-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0cd14272..fed950bd 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 \ |