X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=acinclude.m4;h=cabe7d3a74cafee3f4a175d854c183646372916f;hb=2158888d8d8f3b4c00dcf979390a19fa7fcf7942;hp=70498a995fb9efe8722d52533f24dca599ad24e5;hpb=4aa13c0c348cf78d28095196139489392eae1c67;p=sliver-openvswitch.git diff --git a/acinclude.m4 b/acinclude.m4 index 70498a995..cabe7d3a7 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 @@ -160,6 +152,8 @@ AC_DEFUN([OVS_CHECK_LINUX26_COMPAT], [ [OVS_DEFINE([HAVE_PROTO_DATA_VALID])]) OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [raw], [OVS_DEFINE([HAVE_MAC_RAW])]) + OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_dst(], + [OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])]) OVS_GREP_IFELSE([$KSRC26/include/linux/skbuff.h], [skb_copy_from_linear_data_offset], [OVS_DEFINE([HAVE_SKB_COPY_FROM_LINEAR_DATA_OFFSET])]) @@ -185,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