LU-1346 libcfs: cleanup macros in kp30.h

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

diff --git a/lnet/autoconf/ofed.m4 b/lnet/autoconf/ofed.m4
index aefc27d..029b84a 100644 (file)
--- a/lnet/autoconf/ofed.m4
+++ b/lnet/autoconf/ofed.m4
@@ -5,9 +5,7 @@ AC_DEFUN([LN_CONFIG_OFED_SPEC],
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>
                #include <linux/pci.h>
-               #if !HAVE_GFP_T
-               typedef int gfp_t;
-               #endif
+               #include <linux/gfp.h>
                #include <rdma/ib_verbs.h>
        ],[
                ib_dma_map_single(NULL, NULL, 0, 0);
@@ -24,9 +22,7 @@ AC_DEFUN([LN_CONFIG_OFED_SPEC],
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>
                #include <linux/pci.h>
-               #if !HAVE_GFP_T
-               typedef int gfp_t;
-               #endif
+               #include <linux/gfp.h>
                #include <rdma/ib_verbs.h>
        ],[
                ib_create_cq(NULL, NULL, NULL, NULL, 0, 0);
@@ -39,57 +35,60 @@ AC_DEFUN([LN_CONFIG_OFED_SPEC],
                AC_MSG_RESULT(no)
        ])
 
-       AC_MSG_CHECKING([if OFED supports iWarp transport])
+       AC_MSG_CHECKING([if OFED has RDMA_CM_EVENT_ADDR_CHANGE])
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>
                #include <linux/pci.h>
-               #if !HAVE_GFP_T
-               typedef int gfp_t;
+               #include <linux/gfp.h>
+               #ifdef HAVE_COMPAT_RDMA
+               #include <linux/compat-2.6.h>
                #endif
-               #include <rdma/ib_verbs.h>
+               #include <rdma/rdma_cm.h>
        ],[
-               return RDMA_TRANSPORT_IWARP ==
-                      rdma_node_get_transport(RDMA_NODE_RNIC);
+               return (RDMA_CM_EVENT_ADDR_CHANGE == 0);
        ],[
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_OFED_TRANSPORT_IWARP, 1,
-                         [has transport iWARP])
+               AC_DEFINE(HAVE_OFED_RDMA_CMEV_ADDRCHANGE, 1,
+                         [has completion vector])
        ],[
                AC_MSG_RESULT(no)
        ])
 
-       AC_MSG_CHECKING([if OFED has RDMA_CM_EVENT_ADDR_CHANGE])
+       AC_MSG_CHECKING([if OFED has RDMA_CM_EVENT_TIMEWAIT_EXIT])
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>
                #include <linux/pci.h>
-               #if !HAVE_GFP_T
-               typedef int gfp_t;
+               #include <linux/gfp.h>
+               #ifdef HAVE_COMPAT_RDMA
+               #include <linux/compat-2.6.h>
                #endif
                #include <rdma/rdma_cm.h>
        ],[
-               return (RDMA_CM_EVENT_ADDR_CHANGE == 0);
+               return (RDMA_CM_EVENT_TIMEWAIT_EXIT == 0);
        ],[
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_OFED_RDMA_CMEV_ADDRCHANGE, 1,
+               AC_DEFINE(HAVE_OFED_RDMA_CMEV_TIMEWAIT_EXIT, 1,
                          [has completion vector])
        ],[
                AC_MSG_RESULT(no)
        ])
 
-       AC_MSG_CHECKING([if OFED has RDMA_CM_EVENT_TIMEWAIT_EXIT])
+       AC_MSG_CHECKING([if OFED has rdma_set_reuseaddr])
        LB_LINUX_TRY_COMPILE([
                #include <linux/version.h>
                #include <linux/pci.h>
-               #if !HAVE_GFP_T
-               typedef int gfp_t;
+               #include <linux/gfp.h>
+               #ifdef HAVE_COMPAT_RDMA
+               #include <linux/compat-2.6.h>
                #endif
                #include <rdma/rdma_cm.h>
        ],[
-               return (RDMA_CM_EVENT_TIMEWAIT_EXIT == 0);
+               rdma_set_reuseaddr(NULL, 1);
+               return 0;
        ],[
                AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_OFED_RDMA_CMEV_TIMEWAIT_EXIT, 1,
-                         [has completion vector])
+               AC_DEFINE(HAVE_OFED_RDMA_SET_REUSEADDR, 1,
+                         [rdma_set_reuse defined])
        ],[
                AC_MSG_RESULT(no)
        ])