refresh

diff --git a/meta b/meta
index 2666a4f597ee163402d52568a8e20c4be56b6935..96e4c02ddef3449ba427330fb1d7997e005761f1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 738a7936a9f975707355c7ae1b7e7431d4da2541
-Head: b47f111acc6ed9b4849091ed8b7a2dc9af74ec01
+Previous: e809c4685dd06c6eb4edb5242e5d7aa069627eaf
+Head: c03a7828138eb40f64d0d06980109c87d9606028
 Applied:
   rm-build: 55c53dc74f83d371ca0578662774c16c10847dc0
   bld-32: 4f8ab24b82adb00b15f181d1fa2cf30ca46d6b4b
-  debug: 317f4bcd1724c8e8ef1dce1c6446f8321e83f412
-  refresh-temp: b47f111acc6ed9b4849091ed8b7a2dc9af74ec01
+  debug: c03a7828138eb40f64d0d06980109c87d9606028
 Unapplied:
   apphang: bf8e90dd646f481d5eefb050a4321e9efb9eeef2
   ib_cm_dreq: 31783762cd411bd29a6f46be963978317dc74eb8

diff --git a/patches/debug b/patches/debug
index e14413b4b7299e65a1be7fcf91aae89b44def33b..0ccab6f589379c49e7180658dce1039200e3507a 100644 (file)
--- a/patches/debug
+++ b/patches/debug
@@ -1,5 +1,5 @@
 Bottom: 6a2bdf81ba73de8e7594098c577c9a465b209530
-Top:    9f668e164ecedfe5fcc8fa297eb50d5f24ba462a
+Top:    2fd4d8a1b5a8ae842959374bc76221f1a04bf64a
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2009-12-07 10:36:50 -0800
 
@@ -64,7 +64,7 @@ index 48b0cb5..a3649bc 100644
  }\r
  \r
 diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 49fa417..7b98187 100644
+index 49fa417..fed1934 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
 @@ -27,7 +27,7 @@
@@ -135,7 +135,7 @@ index 49fa417..7b98187 100644
 +{\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 old_state 0x%x\n",\r
-+   p_cep->cid, attr_id, mad_status, cep_state, p_cep->old_state[0]);\r
++   p_cep->cid, attr_id, mad_status, state, p_cep->old_state[0]);\r
 +\r
                pfn_destroy_cb( cep_context );\r
 +}\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4af4fc4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 9f668e164ecedfe5fcc8fa297eb50d5f24ba462a
-Top:    2fd4d8a1b5a8ae842959374bc76221f1a04bf64a
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2009-12-16 16:03:16 -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 7b98187..fed1934 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -2330,7 +2330,7 @@ done:
- {\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 old_state 0x%x\n",\r
--   p_cep->cid, attr_id, mad_status, cep_state, p_cep->old_state[0]);\r
-+   p_cep->cid, attr_id, mad_status, state, p_cep->old_state[0]);\r
- \r
-               pfn_destroy_cb( cep_context );\r
- }