From a108185b0e00fe8254405738cc190cb5bccdba8e Mon Sep 17 00:00:00 2001 From: "U-AMR\\MSHEFTY" Date: Thu, 17 Dec 2009 13:59:53 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 53 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index e4db4b1e..dbac400a 100644 --- a/meta +++ b/meta @@ -1,11 +1,12 @@ Version: 1 -Previous: 669d0f2f338b1ba81a485c1f96e506e22b4f50b1 -Head: 8aaa007ab94b17a9f9cc659362eeeeb73c8ce7f0 +Previous: ee9e888dc1456301bea968e7234c2dfb3ea1b509 +Head: 718de05c643539d6ed59af4534e42618f2bdf1d8 Applied: rm-build: 55c53dc74f83d371ca0578662774c16c10847dc0 bld-32: 4f8ab24b82adb00b15f181d1fa2cf30ca46d6b4b apphang: 39363d3efa43131e2aeb49b42f74b6e446e8b388 debug: 8aaa007ab94b17a9f9cc659362eeeeb73c8ce7f0 + refresh-temp: 718de05c643539d6ed59af4534e42618f2bdf1d8 Unapplied: ib_cm_dreq: 31783762cd411bd29a6f46be963978317dc74eb8 epdisc: 4c931f6af5e37a502f7a10b78a902747f9738623 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..014323e2 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,53 @@ +Bottom: ca319bddfbb13954cab2a3e2352a3275d27cb03d +Top: 7205d797ebb8c1b0cea4413bf8a01b6a1cdc04f2 +Author: U-AMR\MSHEFTY +Date: 2009-12-17 13:59:50 -0800 + +Refresh of debug + +--- + +diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c +index 4d0199d..1c9671f 100644 +--- a/trunk/core/al/kernel/al_cm_cep.c ++++ b/trunk/core/al/kernel/al_cm_cep.c +@@ -2213,21 +2213,19 @@ __cep_mad_send_cb( + + p_cep = (kcep_t*)p_mad->context1; + +- /* +- * The connection context is not set when performing immediate responses, +- * such as repeating MADS. +- */ +- if( !p_cep ) ++ /* The cep context is only set for MADs that are retried. */ ++ if( !p_cep ) + { + ib_put_mad( p_mad ); + AL_EXIT( AL_DBG_CM ); + return; + } + ++ Cl_ASSERT( p_mad->status != IB_WCS_SUCCESS ); + p_mad->context1 = NULL; + + KeAcquireInStackQueuedSpinLockAtDpcLevel( &gp_cep_mgr->lock, &hdl ); +- if( p_cep->p_send_mad != p_mad || p_mad->status == IB_WCS_SUCCESS) ++ if( p_cep->p_send_mad != p_mad ) + { + KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl ); + ib_put_mad( p_mad ); +@@ -2235,12 +2233,7 @@ __cep_mad_send_cb( + } + + /* Clear the sent MAD pointer so that we don't try cancelling again. */ +- if( p_cep->p_send_mad == p_mad ) +- p_cep->p_send_mad = NULL; +- +- /* Treat as a timeout so we don't stall the state machine. */ +- if( p_mad->status == IB_WCS_CANCELED) +- p_mad->status = IB_WCS_TIMEOUT_RETRY_ERR; ++ p_cep->p_send_mad = NULL; + + switch( p_cep->state ) + { -- 2.46.0