[openib-general] [PATCH][TRIVIAL] [kdapl] Minor CM Changes

[Hal Rosenstock]

Minor CM changes
Change label in do_rep_recv to more appropriate name

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

Index: dapl_openib_cm.c
===================================================================
-- dapl_openib_cm.c	(revision 2331)
+++ dapl_openib_cm.c	(working copy)
@@ -68,7 +68,7 @@
 	if (conn->ep->qp_handle == IB_INVALID_HANDLE) {
 		dapl_dbg_log(DAPL_DBG_TYPE_ERR, " do_rep_recv: invalid qp "
 			     "handle\n");
-		goto reject;
+		goto disc;
 	}
 
 	/* First, transition QP to RTR */
@@ -76,7 +76,7 @@
 	if (status) {
 		dapl_dbg_log(DAPL_DBG_TYPE_ERR, " do_rep_recv: could not "
 			     "modify QP state to RTR status %d\n", status);
-		goto reject;
+		goto disc;
 	}
 
 	/* Now, transition QP to RTS */
@@ -84,23 +84,22 @@
 	if (status) {
 		dapl_dbg_log(DAPL_DBG_TYPE_ERR, " do_rep_recv: could not "
 			     "modify QP state to RTS status %d\n", status);
-		goto reject;
+		goto disc;
 	}
 
 	status = ib_send_cm_rtu(conn->cm_id, NULL, 0);
 	if (status) {
 		dapl_dbg_log(DAPL_DBG_TYPE_ERR, " do_rep_recv: ib_send_cm_rtu "
 			     "failed: %d\n", status);
-		goto reject;
+		goto disc;
 	}
 
 	dapl_evd_connection_callback(conn, IB_CME_CONNECTED,
 				     rep_recv_param->private_data, conn->ep);
 	return;
 
-reject:
-	ib_send_cm_rej(conn->cm_id, IB_CM_REJ_CONSUMER_DEFINED, NULL, 0,
-		       NULL, 0);
+disc:
+	ib_send_cm_dreq(conn->cm_id, NULL, 0);	/* ??? */
 	dapl_evd_connection_callback(conn, IB_CME_LOCAL_FAILURE, NULL,
 				     conn->ep);
 }
@@ -456,7 +455,7 @@
 	if (status < 0) {
 		dapl_dbg_log(DAPL_DBG_TYPE_ERR, " ib_at_route_by_ip failed "
 			     "with status %d\n", status);
-		dapl_destroy_cm_id(conn);
+		dapl_destroy_cm_id(conn); /* ??? */
 		return DAT_INTERNAL_ERROR;
 	}