From 65e8063e9de9b9069d8ec1afd8727d62e927023a Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 22 Sep 2010 17:16:35 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 8a068316..825e8076 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: d5d8c5274ec72528b87b28af28986870153bf853 -Head: 418e23caf57561d7601153d84ca615e443e5a253 +Previous: a477353f6422abbf8b61a80e257ed74d9b0a639a +Head: 58b26b8e0122268328aa855614258a0f7235d497 Applied: dapl-update: 2df1438b75e945d48a63fbda74079a77978f315d cma-priv-data: 83299e9a772068a302a4d39ff4e7ba45d4bd26b5 ibal-disc: 418e23caf57561d7601153d84ca615e443e5a253 + refresh-temp: 58b26b8e0122268328aa855614258a0f7235d497 Unapplied: dapl-cookie: dba881d08766e12ba2863c4f57b6a1877b5a8ecf dapl-evd: ede541a6ba3d7d2a69f95b691f69eb9a315bb75d diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..b943f202 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,36 @@ +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