]> git.openfabrics.org - ~shefty/rdma-win.git/commitdiff
refresh (create temporary patch)
authorU-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
Thu, 17 Dec 2009 21:59:53 +0000 (13:59 -0800)
committerU-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
Thu, 17 Dec 2009 21:59:53 +0000 (13:59 -0800)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index e4db4b1e5cd0b13624476ba021e8fc731faa6f42..dbac400af29a017a089c2c45cd6971d487f7039c 100644 (file)
--- 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 (file)
index 0000000..014323e
--- /dev/null
@@ -0,0 +1,53 @@
+Bottom: ca319bddfbb13954cab2a3e2352a3275d27cb03d
+Top:    7205d797ebb8c1b0cea4413bf8a01b6a1cdc04f2
+Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
+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(
\r
+       p_cep = (kcep_t*)p_mad->context1;\r
\r
+-      /*\r
+-       * The connection context is not set when performing immediate responses,\r
+-       * such as repeating MADS.\r
+-       */\r
+-      if( !p_cep )\r
++      /* The cep context is only set for MADs that are retried. */\r
++      if( !p_cep  )\r
+       {\r
+               ib_put_mad( p_mad );\r
+               AL_EXIT( AL_DBG_CM );\r
+               return;\r
+       }\r
\r
++      Cl_ASSERT( p_mad->status != IB_WCS_SUCCESS );\r
+       p_mad->context1 = NULL;\r
\r
+       KeAcquireInStackQueuedSpinLockAtDpcLevel( &gp_cep_mgr->lock, &hdl );\r
+-      if( p_cep->p_send_mad != p_mad || p_mad->status == IB_WCS_SUCCESS)\r
++      if( p_cep->p_send_mad != p_mad )\r
+       {\r
+               KeReleaseInStackQueuedSpinLockFromDpcLevel( &hdl );\r
+               ib_put_mad( p_mad );\r
+@@ -2235,12 +2233,7 @@ __cep_mad_send_cb(
+       }\r
\r
+       /* Clear the sent MAD pointer so that we don't try cancelling again. */\r
+-      if( p_cep->p_send_mad == p_mad )\r
+-              p_cep->p_send_mad = NULL;\r
+-\r
+-      /* Treat as a timeout so we don't stall the state machine. */\r
+-      if( p_mad->status == IB_WCS_CANCELED)\r
+-              p_mad->status = IB_WCS_TIMEOUT_RETRY_ERR;\r
++      p_cep->p_send_mad = NULL;\r
\r
+       switch( p_cep->state )\r
+       {