Version: 1
-Previous: 6e9edfe774f1f68eb72191675b03c8b7be787922
-Head: 3b4ab41159f69528b963faa32f117bf2a81b9b86
+Previous: 36baad7cd4130c47df71721888ef3b579bc42f19
+Head: 74b2b070d20cac194961c90aa4d4764f52bc7c78
Applied:
nd2: f6ad71f3726dd9ddc572452b92ee1b73f56f3004
nd-heap: 1a16264e443de2a1140722ea4640cfc953d66527
wv-reg: b56cb8d7a7baca6cf432141dda100e4484142029
nd-prov: 2097cd64354896a52017ad0c866edcc9d4e58021
nd-adapt-query: da0dc6c83bcbb4c98e81c23ee26f7c559f448ec6
- mr: c57c0d5e7fc7489d795253e0000cdfde36afb103
- refresh-temp: 3b4ab41159f69528b963faa32f117bf2a81b9b86
+ mr: 74b2b070d20cac194961c90aa4d4764f52bc7c78
Unapplied:
sge: b835b8012f9abf2cdcb4335ffa3f0c5cd8b9b88c
srq-32: 0a7372cac2fe6865271611005821e47427c41876
Bottom: deb6a1386b4cfd034b6b42837adf5c3cad9fe1cb
-Top: 985d9fc6503b544b7f74111ea0bcf5e1d3b4b0ad
+Top: 179cc8d7618dab8d5cab3bdff92db927caf27eda
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2010-07-26 16:51:57 -0700
---
diff --git a/trunk/ulp/netdirect2/user/nd_mw.cpp b/trunk/ulp/netdirect2/user/nd_mw.cpp
-index 89ed1a7..f6a85bf 100644
+index 89ed1a7..7e5a27c 100644
--- a/trunk/ulp/netdirect2/user/nd_mw.cpp
+++ b/trunk/ulp/netdirect2/user/nd_mw.cpp
-@@ -35,6 +35,7 @@ CNDMemoryRegion::CNDMemoryRegion(CNDAdapter *pAdapter)
+@@ -1,5 +1,6 @@
+ /*\r
+ * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.\r
++ * Copyright (c) 2010 Microsoft Corporation. All rights reserved.\r
+ *\r
+ * This software is available to you under the OpenIB.org BSD license\r
+ * below:\r
+@@ -35,6 +36,7 @@ CNDMemoryRegion::CNDMemoryRegion(CNDAdapter *pAdapter)
pAdapter->AddRef();\r
m_pAdapter = pAdapter;\r
RtlZeroMemory(&m_Keys, sizeof(m_Keys));\r
}\r
\r
CNDMemoryRegion::~CNDMemoryRegion()\r
-@@ -70,13 +71,26 @@ Release(void)
+@@ -70,13 +72,26 @@ Release(void)
STDMETHODIMP CNDMemoryRegion::\r
CancelOverlappedRequests(void)\r
{\r
}\r
\r
DWORD ConvertAccessFlags(DWORD Flags)\r
-@@ -98,6 +112,7 @@ Register(const VOID* pBuffer, SIZE_T cbBuffer, DWORD flags, OVERLAPPED* pOverlap
+@@ -98,6 +113,7 @@ Register(const VOID* pBuffer, SIZE_T cbBuffer, DWORD flags, OVERLAPPED* pOverlap
{\r
HRESULT hr;\r
\r
hr = m_pAdapter->m_pWvPd->RegisterMemory(pBuffer, cbBuffer, ConvertAccessFlags(flags),\r
pOverlapped, &m_Keys);\r
return NDConvertWVStatus(hr);\r
-@@ -108,7 +123,7 @@ Deregister(OVERLAPPED* pOverlapped)
+@@ -108,7 +124,7 @@ Deregister(OVERLAPPED* pOverlapped)
{\r
HRESULT hr;\r
\r
return NDConvertWVStatus(hr);\r
}\r
diff --git a/trunk/ulp/netdirect2/user/nd_mw.h b/trunk/ulp/netdirect2/user/nd_mw.h
-index f4b9fb3..eb0bbc9 100644
+index f4b9fb3..de8431a 100644
--- a/trunk/ulp/netdirect2/user/nd_mw.h
+++ b/trunk/ulp/netdirect2/user/nd_mw.h
-@@ -83,6 +83,7 @@ public:
+@@ -1,5 +1,6 @@
+ /*\r
+ * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.\r
++ * Copyright (c) 2010 Microsoft Corporation. All rights reserved.\r
+ *\r
+ * This software is available to you under the OpenIB.org BSD license\r
+ * below:\r
+@@ -83,6 +84,7 @@ public:
\r
protected:\r
CNDAdapter *m_pAdapter;\r
+++ /dev/null
-Bottom: 985d9fc6503b544b7f74111ea0bcf5e1d3b4b0ad
-Top: 179cc8d7618dab8d5cab3bdff92db927caf27eda
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2010-07-27 13:59:59 -0700
-
-Refresh of mr
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_mw.cpp b/trunk/ulp/netdirect2/user/nd_mw.cpp
-index f6a85bf..7e5a27c 100644
---- a/trunk/ulp/netdirect2/user/nd_mw.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_mw.cpp
-@@ -1,5 +1,6 @@
- /*\r
- * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.\r
-+ * Copyright (c) 2010 Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is available to you under the OpenIB.org BSD license\r
- * below:\r
-diff --git a/trunk/ulp/netdirect2/user/nd_mw.h b/trunk/ulp/netdirect2/user/nd_mw.h
-index eb0bbc9..de8431a 100644
---- a/trunk/ulp/netdirect2/user/nd_mw.h
-+++ b/trunk/ulp/netdirect2/user/nd_mw.h
-@@ -1,5 +1,6 @@
- /*\r
- * Copyright (c) 2009-2010 Intel Corporation. All rights reserved.\r
-+ * Copyright (c) 2010 Microsoft Corporation. All rights reserved.\r
- *\r
- * This software is available to you under the OpenIB.org BSD license\r
- * below: