[4/5] dapl-2.0 - cma: remove dependency on rdma_cma_abi.h

Commit Message

Arlin Davis June 16, 2010, 5:21 p.m. UTC

None

Patch

diff --git a/dapl/openib_cma/dapl_ib_util.h b/dapl/openib_cma/dapl_ib_util.h
index 96061b3..a710195 100755
--- a/dapl/openib_cma/dapl_ib_util.h
+++ b/dapl/openib_cma/dapl_ib_util.h
@@ -47,6 +47,14 @@ 
 #define IB_MAX_AT_RETRY		3
 
 /* CMA private data areas, use CMA max with known transport definitions */
+#ifndef RDMA_MAX_PRIVATE_DATA
+#if defined(_WIN64) || defined(_WIN32)
+#define RDMA_MAX_PRIVATE_DATA 64 
+#else
+#define RDMA_MAX_PRIVATE_DATA 256
+#endif
+#endif
+
 #define CMA_PDATA_HDR		36
 #define	IB_MAX_REQ_PDATA_SIZE	DAPL_MIN((92-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
 #define	IB_MAX_REP_PDATA_SIZE	DAPL_MIN((196-CMA_PDATA_HDR),RDMA_MAX_PRIVATE_DATA)
diff --git a/dapl/openib_cma/linux/openib_osd.h b/dapl/openib_cma/linux/openib_osd.h
index c537df3..a67018b 100644
--- a/dapl/openib_cma/linux/openib_osd.h
+++ b/dapl/openib_cma/linux/openib_osd.h
@@ -2,7 +2,6 @@ 
 #define OPENIB_OSD_H
 
 #include <rdma/rdma_cma.h>
-#include <rdma/rdma_cma_abi.h>
 #include <byteswap.h>
 #include <sys/poll.h>