Add OFED1.2 support to o2iblnd

[fs/lustre-release.git] / lnet / autoconf / lustre-lnet.m4

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index c5f1740..bec57e5 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -533,6 +533,7 @@ else
        O2IBCPPFLAGS="-I$O2IBPATH/include"
        EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
        EXTRA_KCFLAGS="$EXTRA_KCFLAGS $O2IBCPPFLAGS"
+       EXTRA_LNET_INCLUDE="$O2IBCPPFLAGS $EXTRA_LNET_INCLUDE"
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>
                #if !HAVE_GFP_T
@@ -566,8 +567,21 @@ else
                O2IBLND=""
                O2IBCPPFLAGS=""
        ])
+
+       IB_DMA_MAP="`grep -c ib_dma_map_single ${O2IBPATH}/include/rdma/ib_verbs.h`"
+       if test "$IB_DMA_MAP" != 0 ; then
+               IBLND_OFED_VERSION="102"
+       else
+               IBLND_OFED_VERSION="101"
+       fi
+
+        AC_DEFINE_UNQUOTED(IBLND_OFED_VERSION, $IBLND_OFED_VERSION,
+                          [OFED version])
+
        EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
 fi
+
+AC_SUBST(EXTRA_LNET_INCLUDE)
 AC_SUBST(O2IBCPPFLAGS)
 AC_SUBST(O2IBLND)
 ])