refresh

diff --git a/meta b/meta
index 3549946d0d3ae2a973a5cca493ee2aa560eebcd7..11f603ba23a25ccea329a593c171ffc412d1deab 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 97b66c5b6394efaf09bb37bb01abaa603b629977
-Head: 90bed1f0793cd8b8b50a432bd180db1c420a0716
+Previous: 6637ea160eeddae96ca9be7d30b208c497ddec42
+Head: 5133514971715cbdfa8bb43c2f365f4c37d12554
 Applied:
   rm-build: 4a07738a3e31c0b254263c5aac316c086b1eafce
   epdisc: 4c931f6af5e37a502f7a10b78a902747f9738623
   debug: 7fcfbb36cb831bda7f290662ca81daf212c5fc1a
-  apphang: 23522923394e74797bdc72c17a157a9c183f0338
-  refresh-temp: 90bed1f0793cd8b8b50a432bd180db1c420a0716
+  apphang: 5133514971715cbdfa8bb43c2f365f4c37d12554
 Unapplied:
 Hidden:

diff --git a/patches/apphang b/patches/apphang
index f3a4596a0ac1585bba1fbab34111e2058222bd40..c14dc802623cc8176d9ccfaeb01d791691b516a0 100644 (file)
--- a/patches/apphang
+++ b/patches/apphang
@@ -1,5 +1,5 @@
 Bottom: 8f5bd2c3aaab37399881c1f2eb4b845f7d30d541
-Top:    842554e126ffdbf4e3cdfb06aff33b12620915cd
+Top:    8b448e436ddf6827d951c9f890ba295d299a5635
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2009-12-09 17:26:01 -0800
 
@@ -18,6 +18,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
+index 5f7eff3..a73e547 100644
+--- a/trunk/core/al/kernel/al_cm_cep.c
++++ b/trunk/core/al/kernel/al_cm_cep.c
+@@ -2324,6 +2324,7 @@ done:
+ \r
+       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
+ \r
 diff --git a/trunk/core/winverbs/kernel/wv_ep.c b/trunk/core/winverbs/kernel/wv_ep.c
 index 3d6dece..dd67ee4 100644
 --- a/trunk/core/winverbs/kernel/wv_ep.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3fbd0fb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,20 +0,0 @@
-Bottom: 842554e126ffdbf4e3cdfb06aff33b12620915cd
-Top:    8b448e436ddf6827d951c9f890ba295d299a5635
-Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
-Date:   2009-12-14 18:18:29 -0800
-
-Refresh of apphang
-
----
-
-diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c
-index 5f7eff3..a73e547 100644
---- a/trunk/core/al/kernel/al_cm_cep.c
-+++ b/trunk/core/al/kernel/al_cm_cep.c
-@@ -2324,6 +2324,7 @@ done:
- \r
-       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);