refresh

diff --git a/meta b/meta
index 9e4073f9b57c9896d49190fd4029ec38f21defd1..8fe0ed7df45a9a0c70268e0a3858eebdd1e55e47 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: e2dd20449bae73baec651e428f346b8c1c39cea1
-Head: 523279e8d5fb6cbba03ea73f5dbf7e107eae5545
+Previous: e3786b1bec5fa9f8a5d84dac5354524555241f92
+Head: c9e316cc576721619b5a0b203f40bd0d887cae6d
 Applied:
   rm-build: 55c53dc74f83d371ca0578662774c16c10847dc0
   bld-32: 4f8ab24b82adb00b15f181d1fa2cf30ca46d6b4b
   apphang: 39363d3efa43131e2aeb49b42f74b6e446e8b388
-  debug: 2206d46bbf8719c3550830a9f795e877491d272f
-  refresh-temp: 523279e8d5fb6cbba03ea73f5dbf7e107eae5545
+  debug: c9e316cc576721619b5a0b203f40bd0d887cae6d
 Unapplied:
   ib_cm_dreq: 31783762cd411bd29a6f46be963978317dc74eb8
   epdisc: 4c931f6af5e37a502f7a10b78a902747f9738623

diff --git a/patches/debug b/patches/debug
index 562a57d3d12812f96e719c0f0192de714b064e06..d067caa079b00cf49b87d82f8e488b9db2cbeb12 100644 (file)
--- a/patches/debug
+++ b/patches/debug
@@ -1,5 +1,5 @@
 Bottom: 7784f453d39829ad87057d6488280ca48821ba8c
-Top:    379b90ffaeec64002f3ffd2f2fb5aaa092fff584
+Top:    1b3dbbaafafc7ebd9d86f2f811438dd8f593a479
 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..2c8eb43 100644
+index 49fa417..dbb93ff 100644
 --- a/trunk/core/al/kernel/al_cm_cep.c
 +++ b/trunk/core/al/kernel/al_cm_cep.c
 @@ -27,7 +27,7 @@
@@ -150,7 +150,7 @@ index 49fa417..2c8eb43 100644
        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 old_states 0x%x 0x%x\n",\r
++ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "__cep_mad_send_cb cid 0x%x, attr 0x%x status 0x%x state 0x%x old states 0x%x 0x%x\n",\r
 +   p_cep->cid, attr_id, mad_status, state, p_cep->old_state[0], p_cep->old_state[1]);\r
 +\r
                pfn_destroy_cb( cep_context );\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index bbe8cb3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 379b90ffaeec64002f3ffd2f2fb5aaa092fff584
-Top:    1b3dbbaafafc7ebd9d86f2f811438dd8f593a479
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2009-12-16 18:32:41 -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 2c8eb43..dbb93ff 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -2331,7 +2331,7 @@ 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 old_states 0x%x 0x%x\n",\r
-+ DbgPrintEx(DPFLTR_IHVDRIVER_ID, 0, "__cep_mad_send_cb cid 0x%x, attr 0x%x status 0x%x state 0x%x old states 0x%x 0x%x\n",\r
-    p_cep->cid, attr_id, mad_status, state, p_cep->old_state[0], p_cep->old_state[1]);\r
- \r
-               pfn_destroy_cb( cep_context );