[openib-general] [PATCH] [uDAPL] update to new uCM API

[Sean Hefty]

This patch updates uDAPL to the new uCM API.  It only fixes the build
issues at this point and does not try to optimize for the use of the
new API.  That will come in a later patch.

James, I can commit this when committing the uCM changes if that's okay.

- Sean


Index: dapl/dapl/openib/dapl_ib_cm.c
===================================================================
--- dapl/dapl/openib/dapl_ib_cm.c	(revision 3137)
+++ dapl/dapl/openib/dapl_ib_cm.c	(working copy)
@@ -643,7 +643,8 @@ void cm_thread(void *arg) 
 	
 	dapl_os_lock( &g_cm_lock );
 	while (!g_cm_destroy) {
-		int cm_id,ret;
+		struct ib_cm_id *cm_id;
+		int ret;
 
 		/* select for CM event, all events process via cm_fd */
                 ufds.fd      = ib_cm_get_fd();
@@ -819,7 +820,7 @@ dapls_ib_connect (
 
 	conn->ep = ep_ptr;
 	conn->hca = ep_ptr->header.owner_ia->hca_ptr;
-	status = ib_cm_create_id(&conn->cm_id);
+	status = ib_cm_create_id(&conn->cm_id, conn);
 	if (status < 0)  {
 		dat_status = dapl_convert_errno(errno,"create_cm_id");
 		dapl_os_free(conn, sizeof(*conn));
@@ -1001,7 +1002,7 @@ dapls_ib_setup_conn_listener (
 		return DAT_INTERNAL_ERROR;
 	}
 	 
-	status = ib_cm_create_id(&conn->cm_id);
+	status = ib_cm_create_id(&conn->cm_id, conn);
 	if (status < 0)  {
 		dat_status = dapl_convert_errno(errno,"create_cm_id");
 		dapl_os_free(conn, sizeof(*conn));
Index: dapl/dapl/openib/dapl_ib_util.h
===================================================================
--- dapl/dapl/openib/dapl_ib_util.h	(revision 3137)
+++ dapl/dapl/openib/dapl_ib_util.h	(working copy)
@@ -120,7 +120,7 @@ struct dapl_cm_id {
 	int				retries;
 	int				destroy;
 	int				in_callback;
-	uint32_t			cm_id;
+	struct ib_cm_id			*cm_id;
 	DAT_SOCK_ADDR6			r_addr; 
 	DAT_CONN_QUAL			service_id;
 	struct dapl_hca			*hca;