refresh

diff --git a/meta b/meta
index 3647723f034d6b0222be357d9cfe47bb39e325a1..1758c38ef7a7e7b05131dc1fd444459b13841933 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 833e23a764fa4c9841602fe7b9eb5897395acffe
-Head: 158da89f772b37cc03bf2270389163578a53dd4c
+Previous: 4b0da927e3a428679ad8241e4e2899bcb72a6190
+Head: 3138c2d06c67aac0639153a1c992b49ec9f1d620
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
   nd-prov: 81ab80a03d5f8659869a1bec2a2ab68a3ebf8626
   nd-prov2: 61a1070ec9016e11f409ee637d9fba3946453b85
   nd-adapt-query: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
-  nd-adapt: 1a4581b86e410fb947c09ce13178c84a3d6109be
-  refresh-temp: 158da89f772b37cc03bf2270389163578a53dd4c
+  nd-adapt: 3138c2d06c67aac0639153a1c992b49ec9f1d620
 Unapplied:
   sge: b92e6586257b3937ddf556dc3872778a76ac94a5
   mr: 109bb2efd3748d8126bc22861a2fdbdc3632dbae

diff --git a/patches/nd-adapt b/patches/nd-adapt
index ab2fda4daeb894a8c975c74c96c368db7cef863e..fce7057f89438db0d8e95874e9fee0b18cd79c12 100644 (file)
--- a/patches/nd-adapt
+++ b/patches/nd-adapt
@@ -1,5 +1,5 @@
 Bottom: aded63317d3a994c66a6b04aeed53854ce6f7ec1
-Top:    e360be789abd5a318636040ac4b013ab010955b3
+Top:    dfbc711c3bd688bd28c603f2cc2911009240f1c9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 16:09:26 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-index 6ced0d4..891741e 100644
+index 6ced0d4..408a133 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
 @@ -168,80 +168,111 @@ QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList)
@@ -23,7 +23,7 @@ index 6ced0d4..891741e 100644
  STDMETHODIMP CNDAdapter::\r
 -CreateCompletionQueue(DWORD queueDepth, GROUP_AFFINITY* pAffinity,\r
 -                                        INDCompletionQueue** ppCompletionQueue)\r
-+CreateCompletionQueue(REFIID iid, DWORD queueDepth, KAFFINITY affinity,\r
++CreateCompletionQueue(REFIID iid, DWORD queueDepth, USHORT group, KAFFINITY affinity,\r
 +                                        VOID** ppCompletionQueue)\r
  {\r
        return CNDCompletionQueue::CreateInstance(this, queueDepth, ppCompletionQueue);\r
@@ -56,8 +56,8 @@ index 6ced0d4..891741e 100644
 -                                               DWORD notifyThreshold, GROUP_AFFINITY* pAffinity,\r
 -                                               INDSharedReceiveQueue** ppSharedReceiveQueue)\r
 +CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,\r
-+                                               DWORD notifyThreshold, KAFFINITY affinity,\r
-+                                               VOID** ppSharedReceiveQueue)\r
++                                               DWORD notifyThreshold, USHORT group,\r
++                                               KAFFINITY affinity, VOID** ppSharedReceiveQueue)\r
  {\r
 -      return CNDSharedReceiveQueue::CreateInstance(this, queueDepth, maxSGE,\r
 -                                                                                               notifyThreshold, pAffinity,\r
@@ -153,7 +153,7 @@ index 6ced0d4..891741e 100644
        return CNDListen::CreateInstance(this, ppListen);\r
  }\r
 diff --git a/trunk/ulp/netdirect2/user/nd_adapter.h b/trunk/ulp/netdirect2/user/nd_adapter.h
-index 4210ee3..96cf8d3 100644
+index 4210ee3..941f80a 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.h
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.h
 @@ -49,26 +49,26 @@ public:
@@ -169,13 +169,13 @@ index 4210ee3..96cf8d3 100644
 -                                                                                INDSharedReceiveQueue** ppSharedReceiveQueue);\r
 -      STDMETHODIMP CreateQueuePair(INDCompletionQueue* pReceiveCompletionQueue,\r
 -                                                               INDCompletionQueue* pInitiatorCompletionQueue, VOID* context,\r
-+      STDMETHODIMP CreateCompletionQueue(REFIID iid, DWORD queueDepth, KAFFINITY affinity,\r
-+                                                                         VOID** ppCompletionQueue);\r
++      STDMETHODIMP CreateCompletionQueue(REFIID iid, DWORD queueDepth, USHORT group,\r
++                                                                         KAFFINITY affinity, VOID** ppCompletionQueue);\r
 +      STDMETHODIMP CreateMemoryRegion(REFIID iid, VOID** ppMemoryRegion);\r
 +      STDMETHODIMP CreateMemoryWindow(REFIID iid, VOID** ppMemoryWindow);\r
 +      STDMETHODIMP CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,\r
-+                                                                                DWORD notifyThreshold, KAFFINITY affinity,\r
-+                                                                                VOID** ppSharedReceiveQueue);\r
++                                                                                DWORD notifyThreshold, USHORT group,\r
++                                                                                KAFFINITY affinity, VOID** ppSharedReceiveQueue);\r
 +      STDMETHODIMP CreateQueuePair(REFIID iid, IUnknown* pReceiveCompletionQueue,\r
 +                                                               IUnknown* pInitiatorCompletionQueue, VOID* context,\r
                                                                 DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1c522bf..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,55 +0,0 @@
-Bottom: e360be789abd5a318636040ac4b013ab010955b3
-Top:    dfbc711c3bd688bd28c603f2cc2911009240f1c9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 23:54:10 -0700
-
-Refresh of nd-adapt
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-index 891741e..408a133 100644
---- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -168,7 +168,7 @@ QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList)
- }\r
- \r
- STDMETHODIMP CNDAdapter::\r
--CreateCompletionQueue(REFIID iid, DWORD queueDepth, KAFFINITY affinity,\r
-+CreateCompletionQueue(REFIID iid, DWORD queueDepth, USHORT group, KAFFINITY affinity,\r
-                                         VOID** ppCompletionQueue)\r
- {\r
-       return CNDCompletionQueue::CreateInstance(this, queueDepth, ppCompletionQueue);\r
-@@ -196,8 +196,8 @@ CreateMemoryWindow(REFIID iid, VOID** ppMemoryWindow)
- \r
- STDMETHODIMP CNDAdapter::\r
- CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,\r
--                                               DWORD notifyThreshold, KAFFINITY affinity,\r
--                                               VOID** ppSharedReceiveQueue)\r
-+                                               DWORD notifyThreshold, USHORT group,\r
-+                                               KAFFINITY affinity, VOID** ppSharedReceiveQueue)\r
- {\r
-       if (iid != IID_INDSharedReceiveQueue) {\r
-               return E_NOINTERFACE;\r
-diff --git a/trunk/ulp/netdirect2/user/nd_adapter.h b/trunk/ulp/netdirect2/user/nd_adapter.h
-index 96cf8d3..941f80a 100644
---- a/trunk/ulp/netdirect2/user/nd_adapter.h
-+++ b/trunk/ulp/netdirect2/user/nd_adapter.h
-@@ -49,13 +49,13 @@ public:
-       STDMETHODIMP_(HANDLE) GetFileHandle();\r
-       STDMETHODIMP Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo);\r
-       STDMETHODIMP QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList);\r
--      STDMETHODIMP CreateCompletionQueue(REFIID iid, DWORD queueDepth, KAFFINITY affinity,\r
--                                                                         VOID** ppCompletionQueue);\r
-+      STDMETHODIMP CreateCompletionQueue(REFIID iid, DWORD queueDepth, USHORT group,\r
-+                                                                         KAFFINITY affinity, VOID** ppCompletionQueue);\r
-       STDMETHODIMP CreateMemoryRegion(REFIID iid, VOID** ppMemoryRegion);\r
-       STDMETHODIMP CreateMemoryWindow(REFIID iid, VOID** ppMemoryWindow);\r
-       STDMETHODIMP CreateSharedReceiveQueue(REFIID iid, DWORD queueDepth, DWORD maxSge,\r
--                                                                                DWORD notifyThreshold, KAFFINITY affinity,\r
--                                                                                VOID** ppSharedReceiveQueue);\r
-+                                                                                DWORD notifyThreshold, USHORT group,\r
-+                                                                                KAFFINITY affinity, VOID** ppSharedReceiveQueue);\r
-       STDMETHODIMP CreateQueuePair(REFIID iid, IUnknown* pReceiveCompletionQueue,\r
-                                                                IUnknown* pInitiatorCompletionQueue, VOID* context,\r
-                                                                DWORD receiveQueueDepth, DWORD initiatorQueueDepth,