refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..2b367e5
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,22 @@
+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);