refresh (create temporary patch)

diff --git a/meta b/meta
index 33f9c7806540389e882609ec236b5d29808a9785..252f10892de4b089b009e9f21c90cad2226cb3ea 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 9ada259632f6c8a3093abdd74f38407cea54ee9d
-Head: b42952fe1b0ebbbc958f96de88f5234b39aba0b9
+Previous: 3e87ec023f9bf7b5c20c51e1d22d8b3155dddc86
+Head: a5ea76b1ff5bc62e4e9d5b4db01ece22554850db
 Applied:
   rm-build: 55c53dc74f83d371ca0578662774c16c10847dc0
   bld-32: 4f8ab24b82adb00b15f181d1fa2cf30ca46d6b4b
   debug: b42952fe1b0ebbbc958f96de88f5234b39aba0b9
+  refresh-temp: a5ea76b1ff5bc62e4e9d5b4db01ece22554850db
 Unapplied:
   apphang: bf8e90dd646f481d5eefb050a4321e9efb9eeef2
   ib_cm_dreq: 31783762cd411bd29a6f46be963978317dc74eb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..49a70ee
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,78 @@
+Bottom: d977ff3e5275dc5b3d631ee9f9075b0601e5ef82
+Top:    9f668e164ecedfe5fcc8fa297eb50d5f24ba462a
+Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
+Date:   2009-12-16 15:49:23 -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 2120ee4..7b98187 100644
+--- a/trunk/core/al/kernel/al_cm_cep.c
++++ b/trunk/core/al/kernel/al_cm_cep.c
+@@ -318,6 +318,7 @@ typedef struct _al_kcep
+ \r
+       /* Volatile to allow using atomic operations for state checks. */\r
+       cep_state_t                                     state;\r
++cep_state_t old_state[1];\r
+ \r
+       /*\r
+        * Flag that indicates whether a connection took the active role during\r
+@@ -1737,6 +1738,7 @@ __drep_handler(
+       {\r
+               /* State is DREQ_DESTROY - move to DESTROY to allow cleanup. */\r
+               CL_ASSERT( p_cep->state == CEP_STATE_DREQ_DESTROY );\r
++p_cep->old_state[0] = p_cep->state;\r
+               p_cep->state = CEP_STATE_DESTROY;\r
+ \r
+               ib_put_mad( p_mad );\r
+@@ -2198,7 +2200,7 @@ __cep_mad_send_cb(
+       IN                              ib_mad_element_t                        *p_mad )\r
+ {\r
+ ib_wc_status_t mad_status;\r
+-cep_state_t cep_state;\r
++cep_state_t state;\r
+ ib_net16_t attr_id;\r
+       ib_api_status_t         status;\r
+       cep_agent_t                     *p_port_cep;\r
+@@ -2237,7 +2239,7 @@ ib_net16_t attr_id;
+ \r
+ attr_id = p_mad->p_mad_buf->attr_id;\r
+ mad_status = p_mad->status;\r
+-cep_state = p_cep->state;\r
++state = p_cep->state;\r
+       switch( p_mad->status )\r
+       {\r
+       case IB_WCS_SUCCESS:\r
+@@ -2279,6 +2281,7 @@ cep_state = p_cep->state;
+                       break;\r
+ \r
+               case CEP_STATE_DREQ_DESTROY:\r
++p_cep->old_state[0] = p_cep->state;\r
+                       p_cep->state = CEP_STATE_DESTROY;\r
+                       __insert_timewait( p_cep );\r
+                       /* Fall through. */\r
+@@ -2326,8 +2329,8 @@ done:
+       if( !cl_atomic_dec( &p_cep->ref_cnt ) && pfn_destroy_cb )\r
+ {\r
+ if (mad_status != IB_WCS_CANCELED)\r
+- DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "__cep_mad_send_cb destroying cid 0x%x, attr 0x%x mad status 0x%x cep state 0x%x\n",\r
+-   p_cep->cid, attr_id, mad_status, cep_state);\r
++ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "__cep_mad_send_cb destroying cid 0x%x, attr 0x%x mad status 0x%x cep state 0x%x old_state 0x%x\n",\r
++   p_cep->cid, attr_id, mad_status, cep_state, p_cep->old_state[0]);\r
+ \r
+               pfn_destroy_cb( cep_context );\r
+ }\r
+@@ -4055,10 +4058,12 @@ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "IB CM is D-U-M-B\n");
+               AL_PRINT( TRACE_LEVEL_ERROR, AL_DBG_ERROR, ("CEP in state %d.\n", p_cep->state) );\r
+       case CEP_STATE_TIMEWAIT:\r
+               /* Already in timewait - so all is good. */\r
++p_cep->old_state[0] = p_cep->state;\r
+               p_cep->state = CEP_STATE_DESTROY;\r
+               goto out;\r
+       }\r
+ \r
++p_cep->old_state[0] = p_cep->state;\r
+       p_cep->state = CEP_STATE_DESTROY;\r
+       __insert_timewait( p_cep );