delete

diff --git a/meta b/meta
index e3d237b9436b0ec81e0c13c686f4f57d69da4266..0f8dbc62ed8cd65b99f776957020dc456e5f2ae0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 9eb4fcb944eda5aa9017958880a48c1ef0a57528
+Previous: 06c0bd37790b4642f9169d988bcb66d9541b2026
 Head: 879926ce84176dc42007f5c9f54463d3ca0fbe01
 Applied:
 Unapplied:
-  qp-flush: e6d6179a65aa26829d1c132a6508fcb66556b952
   cq-group: 86b07a20aa4a1241894d41cd8458e4b813937302
   srq-group: c6b406075dbaf90f70dd15c8ce8af5844f9af13e
   cq-status: d4535a68c8d41302c9ee9d44b98a75ea19b4f172

diff --git a/patches/qp-flush b/patches/qp-flush
deleted file mode 100644 (file)
index 884a362..0000000
--- a/patches/qp-flush
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 0237167a14373ec195f0eabeb3a3fd3fe4ddaec9
-Top:    8610aa7a99cb00be3c1d94ba3e9e446f9d8dcd03
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 23:26:09 -0700
-
-ND: implement QP flush
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_qp.cpp b/trunk/ulp/netdirect2/user/nd_qp.cpp
-index f8804c6..da66de8 100644
---- a/trunk/ulp/netdirect2/user/nd_qp.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_qp.cpp
-@@ -140,8 +140,12 @@ Release(void)
- STDMETHODIMP CNDQueuePair::\r
- Flush(void)\r
- {\r
--      //??? Modify QP to error state\r
--      return ND_NOT_SUPPORTED;\r
-+      WV_QP_ATTRIBUTES attr;\r
-+      HRESULT hr;\r
-+\r
-+      attr.QpState = WvQpStateError;\r
-+      hr = m_pWvQp->Modify(&attr, WV_QP_ATTR_STATE, NULL);\r
-+      return NDConvertWVStatus(hr);\r
- }\r
- \r
- STDMETHODIMP_(DWORD) CNDQueuePair::