b=16792

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

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 734d802..f73004e 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -127,6 +127,9 @@ else
        if test "$BOCD" != 0 ; then
                AC_DEFINE(SOCKNAL_BACKOFF, 1, [use tunable backoff TCP])
                AC_MSG_RESULT(yes)
+               if grep rto_max $LINUX/include/linux/tcp.h|grep -q __u16; then
+                   AC_DEFINE(SOCKNAL_BACKOFF_MS, 1, [tunable backoff TCP in ms])
+               fi
        else
                AC_MSG_RESULT([no (no kernel support)])
        fi
@@ -460,7 +463,6 @@ if test $ENABLEO2IB -eq 0; then
        AC_MSG_RESULT([disabled])
 else
        o2ib_found=false
-
        for O2IBPATH in $O2IBPATHS; do
                if test \( -f ${O2IBPATH}/include/rdma/rdma_cm.h -a \
                           -f ${O2IBPATH}/include/rdma/ib_cm.h -a \
@@ -470,7 +472,6 @@ else
                        break
                fi
        done
-
        if ! $o2ib_found; then
                AC_MSG_RESULT([no])
                case $ENABLEO2IB in
@@ -538,41 +539,41 @@ else
                        fi
                fi
 
-                LB_LINUX_TRY_COMPILE([
-                       #include <linux/version.h>
-                       #include <linux/pci.h>
-                       #if !HAVE_GFP_T
-                       typedef int gfp_t;
-                       #endif
-                       #include <rdma/ib_verbs.h>
-                ],[
-                        ib_dma_map_single(NULL, NULL, 0, 0);
-                        return 0;
-                ],[
-                        AC_MSG_RESULT(yes)
-                        AC_DEFINE(HAVE_OFED_IB_DMA_MAP, 1,
-                                  [ib_dma_map_single defined])
-                ],[
-                        AC_MSG_RESULT(NO)
-                ])
-
-                LB_LINUX_TRY_COMPILE([
-                       #include <linux/version.h>
-                       #include <linux/pci.h>
-                       #if !HAVE_GFP_T
-                       typedef int gfp_t;
-                       #endif
-                       #include <rdma/ib_verbs.h>
-                ],[
-                        ib_create_cq(NULL, NULL, NULL, NULL, 0, 0);
-                        return 0;
-                ],[
-                        AC_MSG_RESULT(yes)
-                        AC_DEFINE(HAVE_OFED_IB_COMP_VECTOR, 1,
-                                  [has completion vector])
-                ],[
-                        AC_MSG_RESULT(NO)
-                ])
+               LB_LINUX_TRY_COMPILE([
+                       #include <linux/version.h>
+                       #include <linux/pci.h>
+                       #if !HAVE_GFP_T
+                       typedef int gfp_t;
+                       #endif
+                       #include <rdma/ib_verbs.h>
+               ],[
+                       ib_dma_map_single(NULL, NULL, 0, 0);
+                       return 0;
+               ],[
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_OFED_IB_DMA_MAP, 1,
+                                 [ib_dma_map_single defined])
+               ],[
+                       AC_MSG_RESULT(no)
+               ])
+
+               LB_LINUX_TRY_COMPILE([
+                       #include <linux/version.h>
+                       #include <linux/pci.h>
+                       #if !HAVE_GFP_T
+                       typedef int gfp_t;
+                       #endif
+                       #include <rdma/ib_verbs.h>
+               ],[
+                       ib_create_cq(NULL, NULL, NULL, NULL, 0, 0);
+                       return 0;
+               ],[
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_OFED_IB_COMP_VECTOR, 1,
+                                 [has completion vector])
+               ],[
+                       AC_MSG_RESULT(no)
+               ])
 
                EXTRA_KCFLAGS="$EXTRA_KCFLAGS_save"
        fi