From: Arlin Davis <arlin.r.davis@intel.com>
Date: Wed, 6 Dec 2006 19:49:27 +0000 (-0800)
Subject: Update cma provider to sync with rdma_ucm changes
X-Git-Tag: libdapl-1.2.1~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2280f833090aa9f750d5be8f9b06e7e08e642da5;p=~ardavis%2Fdapl.git

Update cma provider to sync with rdma_ucm changes
---

diff --git a/dapl/openib_cma/dapl_ib_cm.c b/dapl/openib_cma/dapl_ib_cm.c
index d9fd262..0f24244 100644
--- a/dapl/openib_cma/dapl_ib_cm.c
+++ b/dapl/openib_cma/dapl_ib_cm.c
@@ -61,7 +61,6 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <rdma/rdma_cma_ib.h>
 
 extern struct rdma_event_channel *g_cm_events;
 
@@ -117,8 +116,6 @@ static void dapli_addr_resolve(struct dapl_cm_id *conn)
 static void dapli_route_resolve(struct dapl_cm_id *conn)
 {
 	int ret;
-	size_t optlen = sizeof(struct ib_cm_req_opt);
-	struct ib_cm_req_opt req_opt;
 #ifdef DAPL_DBG
 	struct rdma_addr *ipaddr = &conn->cm_id->route.addr;
 	struct ib_addr   *ibaddr = &conn->cm_id->route.addr.addr.ibaddr;
@@ -155,7 +152,7 @@ static void dapli_route_resolve(struct dapl_cm_id *conn)
 		conn->params.private_data_len,
 		conn->params.responder_resources, 
 		conn->params.initiator_depth );
-
+#if 0
 	/* Get default connect request timeout values, and adjust */
 	ret = rdma_get_option(conn->cm_id, RDMA_PROTO_IB, IB_CM_REQ_OPTIONS,
 			      (void*)&req_opt, &optlen);
@@ -185,7 +182,7 @@ static void dapli_route_resolve(struct dapl_cm_id *conn)
 			     strerror(errno));
 		goto bail;
 	}
-
+#endif
 	ret = rdma_connect(conn->cm_id, &conn->params);
 	if (ret) {
 		dapl_dbg_log(DAPL_DBG_TYPE_ERR, " rdma_connect failed: %s\n",
@@ -263,13 +260,13 @@ static struct dapl_cm_id * dapli_req_recv(struct dapl_cm_id *conn,
 		new_conn->hca = conn->hca;
 		
 		/* save private data */
-		if (event->private_data_len) {
+		if (event->param.conn.private_data_len) {
 			dapl_os_memcpy(new_conn->p_data, 
-				       event->private_data,
-				       event->private_data_len);
+				       event->param.conn.private_data,
+				       event->param.conn.private_data_len);
 			new_conn->params.private_data = new_conn->p_data;
 			new_conn->params.private_data_len = 
-						event->private_data_len;
+						event->param.conn.private_data_len;
 		}
 
 		dapl_dbg_log(DAPL_DBG_TYPE_CM, " passive_cb: "
@@ -279,7 +276,7 @@ static struct dapl_cm_id * dapli_req_recv(struct dapl_cm_id *conn,
 			     ntohs(((struct sockaddr_in *)
 					&ipaddr->src_addr)->sin_port),
 			     event->listen_id, new_conn, event->id,
-			     event->private_data, event->private_data_len);
+			     event->param.conn.private_data, event->param.conn.private_data_len);
 		
 		dapl_dbg_log(DAPL_DBG_TYPE_CM, " passive_cb: "
 			     "REQ: IP SRC %x PORT %d DST %x PORT %d\n", 
@@ -377,7 +374,7 @@ static void dapli_cm_active_cb(struct dapl_cm_id *conn,
 			&conn->cm_id->route.addr.dst_addr)->sin_addr.s_addr));
 
 		dapl_evd_connection_callback(conn, IB_CME_CONNECTED,
-					     event->private_data, conn->ep);
+					     event->param.conn.private_data, conn->ep);
 		break;
 
 	case RDMA_CM_EVENT_DISCONNECTED:
@@ -427,7 +424,7 @@ static void dapli_cm_passive_cb(struct dapl_cm_id *conn,
 		if (new_conn)	
 			dapls_cr_callback(new_conn, 
 					  IB_CME_CONNECTION_REQUEST_PENDING, 
-				 	  event->private_data, new_conn->sp);
+				 	  event->param.conn.private_data, new_conn->sp);
 		break;
 	case RDMA_CM_EVENT_UNREACHABLE:
 	case RDMA_CM_EVENT_CONNECT_ERROR: