LU-709 build: cleanup lustre-lnet.m4 and ofed.m4

1. HAVE_SPINLOCK_T is not used
2. OFED supports iWarp transport since v2.6.18

Signed-off-by: Peng Tao <tao.peng@emc.com>
Change-Id: Ieb5971f359b5d81b7dce3db8ea732ca33c6cbd53
Reviewed-on: http://review.whamcloud.com/2327
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Hudson
Reviewed-by: Liang Zhen <liang@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index bcecc9d..3ac6dab 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -637,11 +637,6 @@ AC_CHECK_FUNCS([gethostbyname socket connect])
 # lnet/utils/debug.c
 AC_CHECK_HEADERS([linux/version.h])
 
 # lnet/utils/debug.c
 AC_CHECK_HEADERS([linux/version.h])
 

-AC_CHECK_TYPE([spinlock_t],
-       [AC_DEFINE(HAVE_SPINLOCK_T, 1, [spinlock_t is defined])],
-       [],
-       [#include <linux/spinlock.h>])
-

 # lnet/utils/wirecheck.c
 AC_CHECK_FUNCS([strnlen])
 
 # lnet/utils/wirecheck.c
 AC_CHECK_FUNCS([strnlen])
 

diff --git a/lnet/autoconf/ofed.m4 b/lnet/autoconf/ofed.m4
index ca31fec..8b800c5 100644 (file)
--- a/lnet/autoconf/ofed.m4
+++ b/lnet/autoconf/ofed.m4
@@ -35,23 +35,6 @@ AC_DEFUN([LN_CONFIG_OFED_SPEC],
                AC_MSG_RESULT(no)
        ])
 
                AC_MSG_RESULT(no)
        ])
 

-       AC_MSG_CHECKING([if OFED supports iWarp transport])
-       LB_LINUX_TRY_COMPILE([
-               #include <linux/version.h>
-               #include <linux/pci.h>
-               #include <linux/gfp.h>
-               #include <rdma/ib_verbs.h>
-       ],[
-               return RDMA_TRANSPORT_IWARP ==
-                      rdma_node_get_transport(RDMA_NODE_RNIC);
-       ],[
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_OFED_TRANSPORT_IWARP, 1,
-                         [has transport iWARP])
-       ],[
-               AC_MSG_RESULT(no)
-       ])
-

        AC_MSG_CHECKING([if OFED has RDMA_CM_EVENT_ADDR_CHANGE])
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>
        AC_MSG_CHECKING([if OFED has RDMA_CM_EVENT_ADDR_CHANGE])
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index c5e63ea..e9ebd5f 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2207,15 +2207,6 @@ kiblnd_hdev_get_attr(kib_hca_dev_t *hdev)
                 return rc;
         }
 
                 return rc;
         }
 

-#ifdef HAVE_OFED_TRANSPORT_IWARP
-        /* XXX We can't trust this value returned by Chelsio driver, it's wrong
-         * and we have reported the bug, remove these in the future when Chelsio
-         * bug got fixed. */
-        if (rdma_node_get_transport(hdev->ibh_ibdev->node_type) ==
-            RDMA_TRANSPORT_IWARP)
-                hdev->ibh_mr_size = (1ULL << 32) - 1;
-#endif
-

         if (hdev->ibh_mr_size == ~0ULL) {
                 hdev->ibh_mr_shift = 64;
                 return 0;
         if (hdev->ibh_mr_size == ~0ULL) {
                 hdev->ibh_mr_shift = 64;
                 return 0;