projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Remove brctl wrapper script.
[openvswitch]
/
acinclude.m4
diff --git
a/acinclude.m4
b/acinclude.m4
index 565ca6d28226b20101a560dad275910f68110d21..6a829d596416fa72ae97f50b1ff6bbe3d474f964 100644
(file)
--- a/
acinclude.m4
+++ b/
acinclude.m4
@@
-1,6
+1,6
@@
# -*- autoconf -*-
# -*- autoconf -*-
-# Copyright (c) 2008, 2009, 2010 Nicira Networks.
+# Copyright (c) 2008, 2009, 2010
, 2011
Nicira Networks.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-168,6
+168,10
@@
AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro])
OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats])
OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro])
OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats])
+ OVS_GREP_IFELSE([$KSRC26/include/linux/rcupdate.h], [rcu_read_lock_held], [],
+ [OVS_GREP_IFELSE([$KSRC26/include/linux/rtnetlink.h],
+ [rcu_read_lock_held])])
+
# Check for the proto_data_valid member in struct sk_buff. The [^@]
# is necessary because some versions of this header remove the
# member but retain the kerneldoc comment that describes it (which
# Check for the proto_data_valid member in struct sk_buff. The [^@]
# is necessary because some versions of this header remove the
# member but retain the kerneldoc comment that describes it (which
@@
-184,6
+188,8
@@
AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow_head])
OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_transport_header],
[OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])])
OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow_head])
OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_transport_header],
[OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])])
+ OVS_GREP_IFELSE([$KSRC26/include/linux/icmpv6.h], [icmp6_hdr],
+ [OVS_DEFINE([HAVE_ICMP6_HDR])])
OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro],
[OVS_DEFINE([HAVE_SKB_WARN_LRO])])
OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_warn_if_lro],
[OVS_DEFINE([HAVE_SKB_WARN_LRO])])
@@
-195,10
+201,14
@@
AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [__wsum],
[OVS_DEFINE([HAVE_CSUM_TYPES])])
OVS_GREP_IFELSE([$KSRC26/include/linux/types.h], [__wsum],
[OVS_DEFINE([HAVE_CSUM_TYPES])])
+ OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_replace4])
OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_unfold])
OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [NLA_NUL_STRING])
OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [nla_get_be16])
OVS_GREP_IFELSE([$KSRC26/include/net/checksum.h], [csum_unfold])
OVS_GREP_IFELSE([$KSRC26/include/net/netlink.h], [NLA_NUL_STRING])
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
OVS_CHECK_LOG2_H