refresh

diff --git a/meta b/meta
index df35f1be8c6100c4adeaa0760f2ef0e98733fa4f..53760e3c55139aa95c5db619ab33d5c52622c893 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e6f1f94206ba230d248d951b1ead40450e49666d
-Head: 8a700fb472068b45eb90b57e4b7379bbad4b24a1
+Previous: c049e54a6464b0b6307f04f035edbe666d0f2270
+Head: 4073d4bd9835679d69e79783b4fd841e173ec458
 Applied:
-  nd-heap: 732748a188d7481eb072170119afd02837a62983
-  refresh-temp: 8a700fb472068b45eb90b57e4b7379bbad4b24a1
+  nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
 Unapplied:
   srq: 0024a4123a3ed01d41c946126590641f9f76bc20
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/nd-heap b/patches/nd-heap
index 541abbeb92689c342a21ab9e5771eaeb054dbe40..7dc9986ed9ce9f55e33cbc22d353bf15dbccbbe8 100644 (file)
--- a/patches/nd-heap
+++ b/patches/nd-heap
@@ -1,5 +1,5 @@
 Bottom: 06cdce656914daffeb60188020c0cbccef3f6806
-Top:    e6b93b2a0b77f4869cab7c1190fc59f99ef4422b
+Top:    270427661b969f48613d0f0007132cb64b4f82e7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 14:48:18 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/ulp/netdirect2/user/nd_base.h b/trunk/ulp/netdirect2/user/nd_base.h
-index d11b1a0..07addbe 100644
+index d11b1a0..23dd59e 100644
 --- a/trunk/ulp/netdirect2/user/nd_base.h
 +++ b/trunk/ulp/netdirect2/user/nd_base.h
 @@ -51,14 +51,16 @@ public:
@@ -29,7 +29,7 @@ index d11b1a0..07addbe 100644
  __inline void __cdecl operator delete(void *pObj)\r
  {\r
 -      HeapFree(GetProcessHeap(), 0, pObj);\r
-+      HeapFree(h_gHeap, 0, pObj);\r
++      HeapFree(g_hHeap, 0, pObj);\r
  }\r
  \r
  HRESULT NDConvertWVStatus(HRESULT hr);\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2b367e5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: e6b93b2a0b77f4869cab7c1190fc59f99ef4422b
-Top:    270427661b969f48613d0f0007132cb64b4f82e7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 14:55:03 -0700
-
-Refresh of nd-heap
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_base.h b/trunk/ulp/netdirect2/user/nd_base.h
-index 07addbe..23dd59e 100644
---- a/trunk/ulp/netdirect2/user/nd_base.h
-+++ b/trunk/ulp/netdirect2/user/nd_base.h
-@@ -60,7 +60,7 @@ __inline void* __cdecl operator new(size_t size)
- \r
- __inline void __cdecl operator delete(void *pObj)\r
- {\r
--      HeapFree(h_gHeap, 0, pObj);\r
-+      HeapFree(g_hHeap, 0, pObj);\r
- }\r
- \r
- HRESULT NDConvertWVStatus(HRESULT hr);