X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=3cf4061bd1784fee6eee62e42d71149114bfb84e;hb=870b54e7c7ce23660e6db4999e58d9e6ac2ea618;hp=3cf793d425b61487e4a4e801c8e5d5b87e995ffb;hpb=b2fda3effc787f265b5ad5dfa967ac00627bd075;p=sliver-openvswitch.git diff --git a/acinclude.m4 b/acinclude.m4 index 3cf793d42..3cf4061bd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -96,7 +96,7 @@ AC_DEFUN([OVS_CHECK_LINUX26], [ fi AC_MSG_RESULT([2.$patchlevel.$sublevel]) if test "2.$patchlevel" != '2.6'; then - if test "$BUILD26" = "$KSRC26"; then + if test "$KBUILD26" = "$KSRC26"; then AC_ERROR([Linux kernel in $KBUILD26 is not version 2.6]) else AC_ERROR([Linux kernel in build tree $KBUILD26 (source tree $KSRC26) is not version 2.6]) @@ -204,6 +204,7 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ [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], [consume_skb]) OVS_GREP_IFELSE([$KSRC26/include/linux/string.h], [kmemdup], [], [OVS_GREP_IFELSE([$KSRC26/include/linux/slab.h], [kmemdup])])