X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fautoconf%2Fofed.m4;h=8b800c56e3084316724b8b097bcc9147444952a1;hb=061f6421fcc9a41d53a3f66fff3848cb09b862ad;hp=7b1c41336ab6c075b9a3f2f27bb9b3ab269d1007;hpb=f57c3df5e59c158cb16008031d6b75347609e6ba;p=fs%2Flustre-release.git

diff --git a/lnet/autoconf/ofed.m4 b/lnet/autoconf/ofed.m4
index 7b1c413..8b800c5 100644
--- a/lnet/autoconf/ofed.m4
+++ b/lnet/autoconf/ofed.m4
@@ -1,13 +1,11 @@
 dnl Checks for OFED
 AC_DEFUN([LN_CONFIG_OFED_SPEC],
-[AC_MSG_CHECKING([check ofed specifics])
-
+[
+	AC_MSG_CHECKING([if OFED has ib_dma_map_single])
 	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);
@@ -20,12 +18,11 @@ AC_DEFUN([LN_CONFIG_OFED_SPEC],
 		AC_MSG_RESULT(no)
 	])
 
+	AC_MSG_CHECKING([if ib_create_cq wants comp_vector])
 	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);
@@ -38,54 +35,51 @@ AC_DEFUN([LN_CONFIG_OFED_SPEC],
 		AC_MSG_RESULT(no)
 	])
 
+	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;
-		#endif
-		#include <rdma/ib_verbs.h>
+		#include <linux/gfp.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_TIMEWAIT_EXIT])
 	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/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_set_reuseaddr])
 	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/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)
 	])