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

diff --git a/lnet/autoconf/ofed.m4 b/lnet/autoconf/ofed.m4
index 7b1c413..d4fba98 100644
--- a/lnet/autoconf/ofed.m4
+++ b/lnet/autoconf/ofed.m4
@@ -1,92 +1,82 @@
 dnl Checks for OFED
-AC_DEFUN([LN_CONFIG_OFED_SPEC],
-[AC_MSG_CHECKING([check ofed specifics])
+AC_DEFUN([LN_CONFIG_OFED_SPEC], [
+	AC_MSG_NOTICE([OFED checks
+==============================================================================])
 
-	LB_LINUX_TRY_COMPILE([
+	LB_CHECK_COMPILE([if OFED has 'ib_dma_map_single'],
+	ib_dma_map_single, [
 		#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);
 		return 0;
 	],[
-		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_OFED_IB_DMA_MAP, 1,
-			  [ib_dma_map_single defined])
-	],[
-		AC_MSG_RESULT(no)
+			[ib_dma_map_single defined])
 	])
 
-	LB_LINUX_TRY_COMPILE([
+	LB_CHECK_COMPILE([if OFED 'ib_create_cq' wants 'comp_vector'],
+	ib_create_cq_comp_vector, [
 		#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);
 		return 0;
 	],[
-		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_OFED_IB_COMP_VECTOR, 1,
-			  [has completion vector])
-	],[
-		AC_MSG_RESULT(no)
+			[has completion vector])
 	])
 
-	LB_LINUX_TRY_COMPILE([
+	LB_CHECK_COMPILE([if OFED has 'RDMA_CM_EVENT_ADDR_CHANGE'],
+	RDMA_CM_EVENT_ADDR_CHANGE, [
 		#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>
-	],[
-		return RDMA_TRANSPORT_IWARP ==
-		       rdma_node_get_transport(RDMA_NODE_RNIC);
+		#include <rdma/rdma_cm.h>
 	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_OFED_TRANSPORT_IWARP, 1,
-			  [has transport iWARP])
+		return (RDMA_CM_EVENT_ADDR_CHANGE == 0);
 	],[
-		AC_MSG_RESULT(no)
+		AC_DEFINE(HAVE_OFED_RDMA_CMEV_ADDRCHANGE, 1,
+			[has completion vector])
 	])
 
-	LB_LINUX_TRY_COMPILE([
+	LB_CHECK_COMPILE([if OFED has 'RDMA_CM_EVENT_TIMEWAIT_EXIT'],
+	RDMA_CM_EVENT_TIMEWAIT_EXIT, [
 		#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);
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_OFED_RDMA_CMEV_ADDRCHANGE, 1,
-			  [has completion vector])
+		return (RDMA_CM_EVENT_TIMEWAIT_EXIT == 0);
 	],[
-		AC_MSG_RESULT(no)
+		AC_DEFINE(HAVE_OFED_RDMA_CMEV_TIMEWAIT_EXIT, 1,
+			[has completion vector])
 	])
 
-	LB_LINUX_TRY_COMPILE([
+	LB_CHECK_COMPILE([if OFED has 'rdma_set_reuseaddr'],
+	rdma_set_reuseaddr, [
 		#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);
-	],[
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_OFED_RDMA_CMEV_TIMEWAIT_EXIT, 1,
-			  [has completion vector])
+		rdma_set_reuseaddr(NULL, 1);
+		return 0;
 	],[
-		AC_MSG_RESULT(no)
+		AC_DEFINE(HAVE_OFED_RDMA_SET_REUSEADDR, 1,
+			[rdma_set_reuse defined])
 	])
 ])