From 3f2844befd44c7663e89d24709edbaf940a117b1 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 22 Sep 2010 17:16:38 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/ibal-disc | 14 ++++++++------ patches/refresh-temp | 36 ------------------------------------ 3 files changed, 11 insertions(+), 46 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 825e8076..8cee1f57 100644 --- a/meta +++ b/meta @@ -1,11 +1,10 @@ Version: 1 -Previous: a477353f6422abbf8b61a80e257ed74d9b0a639a -Head: 58b26b8e0122268328aa855614258a0f7235d497 +Previous: 6eda70e1ca5154dc1a32cf8351fc9c69f434d0a1 +Head: 203f6240e2d31e82f784623a8b5a514fdf2f1f7c Applied: dapl-update: 2df1438b75e945d48a63fbda74079a77978f315d cma-priv-data: 83299e9a772068a302a4d39ff4e7ba45d4bd26b5 - ibal-disc: 418e23caf57561d7601153d84ca615e443e5a253 - refresh-temp: 58b26b8e0122268328aa855614258a0f7235d497 + ibal-disc: 203f6240e2d31e82f784623a8b5a514fdf2f1f7c Unapplied: dapl-cookie: dba881d08766e12ba2863c4f57b6a1877b5a8ecf dapl-evd: ede541a6ba3d7d2a69f95b691f69eb9a315bb75d diff --git a/patches/ibal-disc b/patches/ibal-disc index f175ab78..41ac3651 100644 --- a/patches/ibal-disc +++ b/patches/ibal-disc @@ -1,5 +1,5 @@ Bottom: c716c47b937c17300f5a61166bad02f8aebb84e7 -Top: 640f7d75ebc627f65f8cb62fc80cfb06b9de82e9 +Top: f7f2d544218a134f3c4d7ef793f728f1ee392dbf Author: Sean Hefty Date: 2010-09-17 14:17:20 -0700 @@ -26,7 +26,7 @@ Signed-off-by: Sean Hefty --- diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c -index e3c12ff..5f2a3b2 100644 +index e3c12ff..37e158b 100644 --- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c +++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c @@ -46,6 +46,9 @@ @@ -212,7 +212,7 @@ index e3c12ff..5f2a3b2 100644 p_cm_drep_rec->qp_context ); } } -@@ -1101,88 +1118,57 @@ DAT_RETURN +@@ -1101,88 +1118,59 @@ DAT_RETURN dapls_ib_disconnect ( IN DAPL_EP *ep_ptr, IN DAT_CLOSE_FLAGS disconnect_flags ) { @@ -223,6 +223,7 @@ index e3c12ff..5f2a3b2 100644 + ib_cm_dreq_t cm_dreq; + dp_ib_cm_handle_t cm_ptr; + ib_cm_handle_t h_cm; ++ enum dapl_ibal_cm_state state; - dapl_os_assert(ep_ptr); + dapl_os_assert(ep_ptr); @@ -331,11 +332,12 @@ index e3c12ff..5f2a3b2 100644 - } - return ib_status; + -+ h_cm = (cm_ptr->state == IBAL_CM_DREQ) ? cm_ptr->ib_cm : NULL; ++ h_cm = cm_ptr->ib_cm; ++ state = cm_ptr->state; + cm_ptr->state = IBAL_CM_DISCONNECT; + dapl_os_unlock(&ep_ptr->header.lock); + -+ if (h_cm) ++ if (state == IBAL_CM_DREQ) + dapli_send_ib_cm_drep(h_cm); + else + dapli_send_ib_cm_dreq(cm_ptr->ib_cm); @@ -344,7 +346,7 @@ index e3c12ff..5f2a3b2 100644 } -@@ -1692,19 +1678,13 @@ dapls_ib_disconnect_clean ( +@@ -1692,19 +1680,13 @@ dapls_ib_disconnect_clean ( } dapl_os_assert ( ep_ptr->header.magic == DAPL_MAGIC_EP ); diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index b943f202..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,36 +0,0 @@ -Bottom: 640f7d75ebc627f65f8cb62fc80cfb06b9de82e9 -Top: f7f2d544218a134f3c4d7ef793f728f1ee392dbf -Author: Sean Hefty -Date: 2010-09-22 17:16:32 -0700 - -Refresh of ibal-disc - ---- - -diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c -index 5f2a3b2..37e158b 100644 ---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c -+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_cm.c -@@ -1122,6 +1122,7 @@ dapls_ib_disconnect ( IN DAPL_EP *ep_ptr, - ib_cm_dreq_t cm_dreq; - dp_ib_cm_handle_t cm_ptr; - ib_cm_handle_t h_cm; -+ enum dapl_ibal_cm_state state; - - dapl_os_assert(ep_ptr); - -@@ -1159,11 +1160,12 @@ dapls_ib_disconnect ( IN DAPL_EP *ep_ptr, - return dat_status; - } - -- h_cm = (cm_ptr->state == IBAL_CM_DREQ) ? cm_ptr->ib_cm : NULL; -+ h_cm = cm_ptr->ib_cm; -+ state = cm_ptr->state; - cm_ptr->state = IBAL_CM_DISCONNECT; - dapl_os_unlock(&ep_ptr->header.lock); - -- if (h_cm) -+ if (state == IBAL_CM_DREQ) - dapli_send_ib_cm_drep(h_cm); - else - dapli_send_ib_cm_dreq(cm_ptr->ib_cm); -- 2.46.0