From: Arlin Davis <arlin.r.davis@intel.com>
Date: Fri, 12 Jun 2015 20:56:38 +0000 (-0700)
Subject: mcm: return CM_rej with CM_req_in errors
X-Git-Tag: dapl-2.1.6-1~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=175d2334fa704c4656b0f4e69422992cc8545698;p=~ardavis%2Fdapl.git

mcm: return CM_rej with CM_req_in errors

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>
---

diff --git a/dapl/openib_mcm/cm.c b/dapl/openib_mcm/cm.c
index fc623cc..af55cf3 100644
--- a/dapl/openib_mcm/cm.c
+++ b/dapl/openib_mcm/cm.c
@@ -1479,8 +1479,8 @@ dapli_accept_usr(DAPL_EP *ep, DAPL_CR *cr, DAT_COUNT p_size, DAT_PVOID p_data)
 		if (ret) {
 			dapl_log(DAPL_DBG_TYPE_ERR,
 				 " ACCEPT_USR: QPS_RTR ERR %s -> lid %x qpn %x\n",
-				 strerror(errno), ntohs(cm->msg.daddr1.lid),
-				 ntohl(cm->msg.daddr1.qpn));
+				 strerror(errno), ntohs(cm->msg.daddr2.lid),
+				 ntohl(cm->msg.daddr2.qpn));
 			dapl_os_unlock(&ep->header.lock);
 			goto bail;
 		}
@@ -1585,8 +1585,8 @@ dapli_accept_usr(DAPL_EP *ep, DAPL_CR *cr, DAT_COUNT p_size, DAT_PVOID p_data)
 	dapls_thread_signal(&cm->hca->ib_trans.signal);
 	return DAT_SUCCESS;
 bail:
+	dapls_ib_reject_connection(cm, ~IB_CM_REJ_REASON_CONSUMER_REJ, 0, 0);
 	DAPL_CNTR(ia, DCNT_IA_CM_ERR);
-	dapli_cm_free(cm);
 	return DAT_INTERNAL_ERROR;
 }