X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=acinclude.m4;h=fa1de8668c17051063c8f612889f1106cea49581;hb=f17f1592346032c08ca809c2488e76c0ddfaa199;hp=1f52cf142baef1e7583a881eb10d8615108702f8;hpb=8a9562d21a40c765a8ae6775a070cb279cb2147a;p=cascardo%2Fovs.git

diff --git a/acinclude.m4 b/acinclude.m4
index 1f52cf142..fa1de8668 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -35,8 +35,8 @@ AC_DEFUN([OVS_CHECK_LINUX], [
   AC_ARG_WITH([linux-source],
               [AC_HELP_STRING([--with-linux-source=/path/to/linux-source],
                               [Specify the Linux kernel source directory
-			       (usually figured out automatically from build
-			       directory)])])
+                               (usually figured out automatically from build
+                               directory)])])
 
   # Deprecated equivalents to --with-linux, --with-linux-source.
   AC_ARG_WITH([l26])
@@ -75,11 +75,11 @@ AC_DEFUN([OVS_CHECK_LINUX], [
     # Make sure that it exists.
     AC_MSG_CHECKING([for Linux build directory])
     if test -d "$KBUILD"; then
-	AC_MSG_RESULT([$KBUILD])
-	AC_SUBST(KBUILD)
+        AC_MSG_RESULT([$KBUILD])
+        AC_SUBST(KBUILD)
     else
-	AC_MSG_RESULT([no])
-	AC_ERROR([source dir $KBUILD doesn't exist])
+        AC_MSG_RESULT([no])
+        AC_ERROR([source dir $KBUILD doesn't exist])
     fi
 
     # Debian breaks kernel headers into "source" header and "build" headers.
@@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
     AC_MSG_RESULT([$kversion])
 
     if test "$version" -ge 3; then
-       if test "$version" = 3 && test "$patchlevel" -le 12; then
+       if test "$version" = 3 && test "$patchlevel" -le 14; then
           : # Linux 3.x
        else
-         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported])
+         AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.14.x is not supported (please refer to the FAQ for advice)])
        fi
     else
        if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
@@ -150,7 +150,7 @@ AC_DEFUN([OVS_CHECK_LINUX], [
         test ! -e "$KBUILD"/include/generated/uapi/linux/version.h)|| \
        (test ! -e "$KBUILD"/include/linux/autoconf.h && \
         test ! -e "$KBUILD"/include/generated/autoconf.h); then
-	AC_MSG_ERROR([Linux kernel source in $KBUILD is not configured])
+        AC_MSG_ERROR([Linux kernel source in $KBUILD is not configured])
     fi
     OVS_CHECK_LINUX_COMPAT
   fi
@@ -163,7 +163,7 @@ dnl Configure DPDK source tree
 AC_DEFUN([OVS_CHECK_DPDK], [
   AC_ARG_WITH([dpdk],
               [AC_HELP_STRING([--with-dpdk=/path/to/dpdk],
-                              [Specify the DPDP build directory])])
+                              [Specify the DPDK build directory])])
 
   if test X"$with_dpdk" != X; then
     RTE_SDK=$with_dpdk
@@ -244,10 +244,13 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/linux/err.h], [ERR_CAST])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [eth_hw_addr_random])
+  OVS_GREP_IFELSE([$KSRC/include/linux/etherdevice.h], [ether_addr_copy])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [vlan_set_encap_proto])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/in.h], [ipv4_is_multicast])
+  OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [__ip_select_ident.*dst_entry],
+                  [OVS_DEFINE([HAVE_IP_SELECT_IDENT_USING_DST_ENTRY])])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_disable_lro])
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [dev_get_stats])
@@ -255,6 +258,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [__skb_gso_segment])
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [can_checksum_protocol])
   OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_features_t])
+  OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], [pcpu_sw_netstats])
+
+  OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/rcupdate.h], [rcu_read_lock_held], [],
                   [OVS_GREP_IFELSE([$KSRC/include/linux/rtnetlink.h],
@@ -269,6 +275,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid],
                   [OVS_DEFINE([HAVE_PROTO_DATA_VALID])])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [rxhash])
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [u16.*rxhash],
+                  [OVS_DEFINE([HAVE_U16_RXHASH])])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(],
                   [OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], 
@@ -288,6 +296,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [__skb_fill_page_desc])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_reset_mac_len])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_unclone])
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_orphan_frags])
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_get_hash])
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_clear_hash])
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [l4_rxhash])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool],
                   [OVS_DEFINE([HAVE_BOOL_TYPE])])
@@ -314,6 +326,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
 
   OVS_GREP_IFELSE([$KSRC/include/linux/percpu.h], [this_cpu_ptr])
 
+  OVS_GREP_IFELSE([$KSRC/include/linux/u64_stats_sync.h], [u64_stats_fetch_begin_irq])
+
   OVS_GREP_IFELSE([$KSRC/include/linux/openvswitch.h], [openvswitch_handle_frame_hook],
                   [OVS_DEFINE([HAVE_RHEL_OVS_HOOK])])
 
@@ -584,25 +598,25 @@ AC_DEFUN([OVS_CHECK_PTHREAD_SET_NAME],
        [for pthread_setname_np() variant],
        [ovs_cv_pthread_setname_np],
        [AC_LINK_IFELSE(
-	 [AC_LANG_PROGRAM([#include <pthread.h>
+         [AC_LANG_PROGRAM([#include <pthread.h>
   ], [pthread_setname_np(pthread_self(), "name");])],
-	 [ovs_cv_pthread_setname_np=glibc],
+         [ovs_cv_pthread_setname_np=glibc],
          [AC_LINK_IFELSE(
-	   [AC_LANG_PROGRAM([#include <pthread.h>
+           [AC_LANG_PROGRAM([#include <pthread.h>
 ], [pthread_setname_np(pthread_self(), "%s", "name");])],
            [ovs_cv_pthread_setname_np=netbsd],
-	   [ovs_cv_pthread_setname_np=none])])])
+           [ovs_cv_pthread_setname_np=none])])])
      case $ovs_cv_pthread_setname_np in # (
        glibc)
-	  AC_DEFINE(
-	    [HAVE_GLIBC_PTHREAD_SETNAME_NP], [1],
-	    [Define to 1 if pthread_setname_np() is available and takes 2 parameters (like glibc).])
-	  ;; # (
+          AC_DEFINE(
+            [HAVE_GLIBC_PTHREAD_SETNAME_NP], [1],
+            [Define to 1 if pthread_setname_np() is available and takes 2 parameters (like glibc).])
+          ;; # (
        netbsd)
-	  AC_DEFINE(
-	    [HAVE_NETBSD_PTHREAD_SETNAME_NP], [1],
-	    [Define to 1 if pthread_setname_np() is available and takes 3 parameters (like NetBSD).])
-	  ;;
+          AC_DEFINE(
+            [HAVE_NETBSD_PTHREAD_SETNAME_NP], [1],
+            [Define to 1 if pthread_setname_np() is available and takes 3 parameters (like NetBSD).])
+          ;;
      esac
    fi])