refresh (create temporary patch)

diff --git a/meta b/meta
index c388cb09cfcd8775c4a862a73e3174536419953c..e4b2c0ca2cc497e2833d69156af066f8d3723edb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: aa46ca4d9ce091756b2ff5214e99363c0aca34e9
-Head: c69f22116310005e08bf82c2d693108c4037b535
+Previous: d03a9875829e15f576fdeb3e41fbc8f21003c5f0
+Head: bf292a8bbcddd13d14c26c3bf1b6d1d3da88b0a9
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
@@ -10,6 +10,7 @@ Applied:
   nd-adapt: 89c3aaa5d3df57c2dcc7cbb7042ff6ba2e771925
   sge: 84588550c84d1c3edae7eabcc0caad91e3b4c720
   mr: c69f22116310005e08bf82c2d693108c4037b535
+  refresh-temp: bf292a8bbcddd13d14c26c3bf1b6d1d3da88b0a9
 Unapplied:
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
   wv-ver: 9abd550558317c525e7f7f82caae75f1a810d2b7

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..bd60946
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,54 @@
+Bottom: a7a074b7cb17ec923af6858ecb830636b96b9cc6
+Top:    2a412a568f760567b55f58104171fa455e3a744d
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-07-26 16:55:14 -0700
+
+Refresh of mr
+
+---
+
+diff --git a/trunk/ulp/netdirect2/user/nd_mw.cpp b/trunk/ulp/netdirect2/user/nd_mw.cpp
+index be5446d..53006f5 100644
+--- a/trunk/ulp/netdirect2/user/nd_mw.cpp
++++ b/trunk/ulp/netdirect2/user/nd_mw.cpp
+@@ -67,6 +67,25 @@ Release(void)
+       return CNDBase::Release();\r
+ }\r
+ \r
++STDMETHODIMP CNDMemoryRegion::\r
++CancelOverlappedRequests(void)\r
++{\r
++      HRESULT hr;\r
++\r
++      hr = m_pWvCq->CancelOverlappedRequests();\r
++      return NDConvertWVStatus(hr);\r
++}\r
++\r
++STDMETHODIMP CNDMemoryRegion::\r
++GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)\r
++{\r
++      DWORD bytes;\r
++      HRESULT hr;\r
++\r
++      hr = m_pWvCq->GetOverlappedResult(pOverlapped, &bytes, bWait);\r
++      return NDConvertWVStatus(hr);\r
++}\r
++\r
+ DWORD ConvertAccessFlags(DWORD Flags)\r
+ {\r
+       DWORD opts = 0;\r
+diff --git a/trunk/ulp/netdirect2/user/nd_mw.h b/trunk/ulp/netdirect2/user/nd_mw.h
+index 47c18b2..f4b9fb3 100644
+--- a/trunk/ulp/netdirect2/user/nd_mw.h
++++ b/trunk/ulp/netdirect2/user/nd_mw.h
+@@ -45,6 +45,10 @@ public:
+       STDMETHODIMP_(ULONG) AddRef();\r
+       STDMETHODIMP_(ULONG) Release();\r
+ \r
++      // INDOverlapped methods\r
++      STDMETHODIMP CancelOverlappedRequests();\r
++      STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);\r
++\r
+       // INDMemoryRegion methods\r
+       STDMETHODIMP Register(const VOID* pBuffer, SIZE_T cbBuffer, DWORD flags,\r
+                                                 OVERLAPPED* pOverlapped);