Version: 1
-Previous: f2b7799d3ce5cd0f1762bbf7d80ed10ace97ed1d
-Head: a335c43e832cf61a51b1af717b61d303e634ac04
+Previous: ef5defd4d502cc07040ab0959ebffe1823e570af
+Head: e14d3f9d74402d692944da0737d5ec17be25009d
Applied:
rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
port_attr: 6cb488a1a7ddc36e7017499d52152f0267669e02
nd-conn: 07e99cfc4b3c927361925d099215dd15d008f5c5
nd-status: a1f7a8e10f4072b483c67571f2f08108babd1a57
ep-disc: 5e27160d35dc3fbd0fbb142d6e46301b13ab3089
- dapl-ep: 47123d07a0607eadffa808a96982b28bdf65a85e
- refresh-temp: a335c43e832cf61a51b1af717b61d303e634ac04
+ dapl-ep: e14d3f9d74402d692944da0737d5ec17be25009d
Unapplied:
nd-read: 5995a0340f6415ef00c2af33f9d1adbcc6e36165
debug-wv: f98e9be2365ed35d30abdf31128c331322849c93
Bottom: 0e2449003ef82541d904876fde61aba51cd7a54a
-Top: 0e2449003ef82541d904876fde61aba51cd7a54a
+Top: b6e1049945cd3f46ef0fe95534d89be25e2b48a5
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2010-03-09 15:44:52 -0800
---
-
+diff --git a/trunk/ulp/dapl2/dapl/openib_scm/cm.c b/trunk/ulp/dapl2/dapl/openib_scm/cm.c
+index 6958b67..2969483 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 */
+++ /dev/null
-Bottom: 0e2449003ef82541d904876fde61aba51cd7a54a
-Top: b6e1049945cd3f46ef0fe95534d89be25e2b48a5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2010-03-09 15:45:09 -0800
-
-Refresh of dapl-ep
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/openib_scm/cm.c b/trunk/ulp/dapl2/dapl/openib_scm/cm.c
-index 6958b67..2969483 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 */