X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=015bf6654dc5f8371de00369d6b290ccfc09477b;hb=e3648418c4bf028e6bca38bcbfc5a5ed493447fb;hp=8643cf7b6d3375f2d052d4c87ba2dd5ad68fd454;hpb=85444c3f79f594c838d4b3e72ff27e263514f194;p=openvswitch

diff --git a/acinclude.m4 b/acinclude.m4
index 8643cf7b..015bf665 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -113,16 +113,6 @@ AC_DEFUN([OVS_DEFINE], [
   echo '#define $1 1' >> datapath/linux-2.6/kcompat.h.new
 ])
 
-AC_DEFUN([OVS_CHECK_VETH], [
-  AC_MSG_CHECKING([whether to build veth module])
-  if test "$sublevel" = 18; then
-    AC_MSG_RESULT([yes])
-    AC_SUBST([BUILD_VETH], 1)
-  else
-    AC_MSG_RESULT([no])
-  fi
-])
-
 AC_DEFUN([OVS_CHECK_LOG2_H], [
   AC_MSG_CHECKING([for $KSRC26/include/linux/log2.h])
   if test -e $KSRC26/include/linux/log2.h; then
@@ -150,6 +140,8 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
 
   OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_disable_lro],
                   [OVS_DEFINE([HAVE_DEV_DISABLE_LRO])])
+  OVS_GREP_IFELSE([$KSRC26/include/linux/netdevice.h], [dev_get_stats],
+                  [OVS_DEFINE([HAVE_DEV_GET_STATS])])
 
   # Check for the proto_data_valid member in struct sk_buff.  The [^@]
   # is necessary because some versions of this header remove the
@@ -165,8 +157,8 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
   OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], 
                   [skb_copy_from_linear_data_offset],
                   [OVS_DEFINE([HAVE_SKB_COPY_FROM_LINEAR_DATA_OFFSET])])
-  OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow],
-                  [OVS_DEFINE([HAVE_SKB_COW])])
+  OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_cow_head],
+                  [OVS_DEFINE([HAVE_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_warn_if_lro],
@@ -187,7 +179,6 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [
                   [OVS_DEFINE([HAVE_NLA_GET_BE16])])
 
   OVS_CHECK_LOG2_H
-  OVS_CHECK_VETH
 
   if cmp -s datapath/linux-2.6/kcompat.h.new \
             datapath/linux-2.6/kcompat.h >/dev/null 2>&1; then