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

[James Lentini]

Committed in revision 2346.

On Fri, 13 May 2005, Hal Rosenstock wrote:

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