refresh

diff --git a/meta b/meta
index 77b6e359c0c14ff4e31f0de4a037ce1a9b30d0c0..cedded9291e892a02e6488adfb82473760f089e3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: d83f006bf9a1d53dbe78cbe33503863599d99cfd
-Head: 02bd0e0fe4166c2ad9e7bdce81107b80edfc175e
+Previous: 0fc349330928db1ca28b32e0612a1d434a946aad
+Head: e22c09acef52e5c119f80c0a646bcf9035094b80
 Applied:
   rm-build: f8b9ec0b6d170b978c0e0167d76425f613b07971
   wv-pkey: 3b12d6a5e096d5f83a4f3b0ed4e9afc3a4f2e844
-  test-wv-print: b662884c01b675ae16f17ff0cc31517cc8f7682c
-  refresh-temp: 02bd0e0fe4166c2ad9e7bdce81107b80edfc175e
+  test-wv-print: e22c09acef52e5c119f80c0a646bcf9035094b80
 Unapplied:
   umad: 14a0a934f6cf1c6a25ad722c21193cc54d22fa0e
   test-pkey0: 812ba9c5ccb0e841f37bdc52713151bd4175613e

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 385940e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: ce230bfa541984a448dddb5200079f800e699208
-Top:    1fbf745215d4b7d5f5430f5089f601a658f332ec
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-01-18 11:04:55 -0800
-
-Refresh of test-wv-print
-
----
-
-diff --git a/trunk/core/winverbs/user/wv_qp.cpp b/trunk/core/winverbs/user/wv_qp.cpp
-index 57d2403..dd1038c 100644
---- a/trunk/core/winverbs/user/wv_qp.cpp
-+++ b/trunk/core/winverbs/user/wv_qp.cpp
-@@ -305,8 +305,6 @@ CWVQueuePair::~CWVQueuePair()
-               hr = WvDeviceIoControl(m_hFile, WV_IOCTL_QP_DESTROY, &m_Id, sizeof m_Id,\r
-                                                          NULL, 0, &bytes, NULL) ?\r
-                                                          WV_SUCCESS : HRESULT_FROM_WIN32(GetLastError());\r
--if (hr)\r
--printf("~CWVQueuePair() failed: 0x%x\n", hr);\r
-               m_pVerbs->post_destroy_qp(m_hVerbsQp, (ib_api_status_t) hr);\r
-       }\r
-       ReleaseReferences();

diff --git a/patches/test-wv-print b/patches/test-wv-print
index f985e600bed9d121b4e620e0892f503370fbf6e9..3341863b861a4e42f9b1face624d3f714ae23a45 100644 (file)
--- a/patches/test-wv-print
+++ b/patches/test-wv-print
@@ -1,5 +1,5 @@
 Bottom: 9109865236d70eae6d1fc93cad4d7c1d2da6bce6
-Top:    ce230bfa541984a448dddb5200079f800e699208
+Top:    1fbf745215d4b7d5f5430f5089f601a658f332ec
 Author: U-AMR\MSHEFTY <MSHEFTY@mshefty-MOBL2.amr.corp.intel.com>
 Date:   2010-01-14 11:24:10 -0800
 
@@ -32,17 +32,4 @@ index f37cf96..d41a5ee 100644
 +#include <stdio.h>\r
  \r
  #include <iba\ib_types.h>\r
- #include <iba\ib_uvp.h>\r
-diff --git a/trunk/core/winverbs/user/wv_qp.cpp b/trunk/core/winverbs/user/wv_qp.cpp
-index dd1038c..57d2403 100644
---- a/trunk/core/winverbs/user/wv_qp.cpp
-+++ b/trunk/core/winverbs/user/wv_qp.cpp
-@@ -305,6 +305,8 @@ CWVQueuePair::~CWVQueuePair()
-               hr = WvDeviceIoControl(m_hFile, WV_IOCTL_QP_DESTROY, &m_Id, sizeof m_Id,\r
-                                                          NULL, 0, &bytes, NULL) ?\r
-                                                          WV_SUCCESS : HRESULT_FROM_WIN32(GetLastError());\r
-+if (hr)\r
-+printf("~CWVQueuePair() failed: 0x%x\n", hr);\r
-               m_pVerbs->post_destroy_qp(m_hVerbsQp, (ib_api_status_t) hr);\r
-       }\r
-       ReleaseReferences();
+ #include <iba\ib_uvp.h>