From a335c43e832cf61a51b1af717b61d303e634ac04 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 9 Mar 2010 15:45:09 -0800 Subject: [PATCH] Refresh of dapl-ep --- trunk/ulp/dapl2/dapl/openib_scm/cm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/trunk/ulp/dapl2/dapl/openib_scm/cm.c b/trunk/ulp/dapl2/dapl/openib_scm/cm.c index 6958b674..29694835 100644 --- a/trunk/ulp/dapl2/dapl/openib_scm/cm.c +++ b/trunk/ulp/dapl2/dapl/openib_scm/cm.c @@ -1143,6 +1143,9 @@ dapli_socket_accept_usr(DAPL_EP * ep_ptr, cm_ptr->hca = ia_ptr->hca_ptr; cm_ptr->state = DCM_ACCEPTED; + dapl_ep_link_cm(ep_ptr, cm_ptr); + cm_ptr->ep = ep_ptr; + local.p_size = htons(p_size); iov[0].iov_base = (void *)&local; iov[0].iov_len = exp; @@ -1160,6 +1163,8 @@ dapli_socket_accept_usr(DAPL_EP * ep_ptr, strerror(errno), len, inet_ntoa(((struct sockaddr_in *) &cm_ptr->msg.daddr.so)->sin_addr)); + dapl_ep_unlink_cm(ep_ptr, cm_ptr); + cm_ptr->ep = NULL; goto bail; } @@ -1175,10 +1180,6 @@ dapli_socket_accept_usr(DAPL_EP * ep_ptr, htonll(*(uint64_t*)&local.saddr.ib.gid[8])); dapl_dbg_log(DAPL_DBG_TYPE_EP, " PASSIVE: accepted!\n"); - - /* Link CM to EP, already queued on work thread */ - dapl_ep_link_cm(ep_ptr, cm_ptr); - cm_ptr->ep = ep_ptr; return DAT_SUCCESS; bail: /* schedule cleanup from workq */ -- 2.46.0