delete

diff --git a/meta b/meta
index 16dc10d34d6f25c9bcc02552f7c4cbc10e7c271d..03a4386149f13b74382038a89acf950a19129e86 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 291ea3b2975bc8b773183d06184c82f8d5ea1376
+Previous: a5488ea2c9c8e4647e84b05469cae992bef773f0
 Head: 879926ce84176dc42007f5c9f54463d3ca0fbe01
 Applied:
 Unapplied:
-  mrf: 3b645d459d14a6d89304fd8caf09ab58e0889f57
   obj-cnt: c6ecdb4545c70edb3254e97d6a738baf055ef540
   rm-cf: 9754416bc7499b501b4c30330c732722d8217d7f
   crt: 46b036758f5e55a149164fae0587c71582917685

diff --git a/patches/mrf b/patches/mrf
deleted file mode 100644 (file)
index 160acf7..0000000
--- a/patches/mrf
+++ /dev/null
@@ -1,65 +0,0 @@
-Bottom: 7ed8cd37e984aa6077cba8fa4e6ff2029cb16c5e
-Top:    bb6354ac155628ae2c9bac41800f9c7f0e2aeeda
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-28 10:34:28 -0700
-
-mr flags
-
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_mw.cpp b/trunk/ulp/netdirect2/user/nd_mw.cpp
-index 7e5a27c..82338bc 100644
---- a/trunk/ulp/netdirect2/user/nd_mw.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_mw.cpp
-@@ -94,17 +94,24 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
-       return hr;\r
- }\r
- \r
--DWORD ConvertAccessFlags(DWORD Flags)\r
-+DWORD CNDMemoryRegion::\r
-+ConvertAccessFlags(DWORD Flags)\r
- {\r
-       DWORD opts = 0;\r
- \r
--      //other flags to convert???\r
--      if (!(Flags & ND_OP_FLAG_ALLOW_READ)) {\r
--              opts |= WV_ACCESS_REMOTE_READ;\r
-+      if (Flags & ND_MR_FLAG_ALLOW_LOCAL_WRITE) {\r
-+              opts |= WV_ACCESS_LOCAL_WRITE;\r
-       }\r
--      if (Flags & ND_OP_FLAG_ALLOW_WRITE) {\r
--              opts |= WV_ACCESS_REMOTE_WRITE;\r
-+      if (Flags & ND_MR_FLAG_ALLOW_REMOTE_READ) {\r
-+              opts |= WV_ACCESS_REMOTE_READ | WV_ACCESS_MW_BIND;\r
-       }\r
-+      if (Flags & ND_MR_FLAG_ALLOW_REMOTE_WRITE) {\r
-+              opts |= WV_ACCESS_REMOTE_WRITE | WV_ACCESS_MW_BIND;\r
-+      }\r
-+      if (!(Flags & ND_MR_FLAG_DO_NOT_SECURE_VM)) {\r
-+              opts |= WV_ACCESS_CACHABLE;\r
-+      }\r
-+\r
-       return opts;\r
- }\r
- \r
-diff --git a/trunk/ulp/netdirect2/user/nd_mw.h b/trunk/ulp/netdirect2/user/nd_mw.h
-index de8431a..245addc 100644
---- a/trunk/ulp/netdirect2/user/nd_mw.h
-+++ b/trunk/ulp/netdirect2/user/nd_mw.h
-@@ -85,6 +85,8 @@ public:
- protected:\r
-       CNDAdapter                      *m_pAdapter;\r
-       OVERLAPPED                      *m_pOverlapped;\r
-+\r
-+      DWORD ConvertAccessFlags(DWORD Flags);\r
- };\r
- \r
- \r
-@@ -128,6 +130,4 @@ protected:
-       CNDAdapter                      *m_pAdapter;\r
- };\r
- \r
--DWORD ConvertAccessFlags(DWORD Flags);\r
--\r
- #endif // _ND_MW_H_