squash

diff --git a/meta b/meta
index 6a542890a6745f61ea5f9262053e8a19bc62b8c1..db3353de8ded2b17a360d4b3e56e247af0f12435 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,8 @@
 Version: 1
-Previous: 19235b063ef476c36c3efc805bee5b4b41d68f46
-Head: 7d65cea561a9f38c17850f80564e98f89496781b
+Previous: 219ff956c710ba7bb9a515a959198ff9ff9e6763
+Head: 67be79c13044135260c3aa85da0323046bf7af77
 Applied:
-  nd2: 30c496b130fd4d97de60057246b6f732c9ef3976
-  listen: e1149899d76e78a4b3ea73e057926f1959b0e1b6
-  connect: b2273414a67700cb587560e924625912b9fba4bd
-  cq: ea731fe290da1d2634505921dc5857e1102d8609
-  qp: 2b086b2dd426c59127ec4c1f1c3779903f215032
-  nd-api: 7d65cea561a9f38c17850f80564e98f89496781b
+  nd2: 67be79c13044135260c3aa85da0323046bf7af77
 Unapplied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a

diff --git a/patches/connect b/patches/connect
deleted file mode 100644 (file)
index 2f36c6c..0000000
--- a/patches/connect
+++ /dev/null
@@ -1,87 +0,0 @@
-Bottom: ef95c29c42cccad6af3a85874d8b5c29bc975e58
-Top:    97ba8e4788f71ae084e14bc13f1dce86ada42600
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 17:42:23 -0700
-
-nd: update Connect APIs to match latest spec
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_connect.cpp b/trunk/ulp/netdirect2/user/nd_connect.cpp
-index 579fd11..7d9f71d 100644
---- a/trunk/ulp/netdirect2/user/nd_connect.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_connect.cpp
-@@ -113,7 +113,7 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
- }\r
- \r
- STDMETHODIMP CNDConnector::\r
--ConnectQp(INDQueuePair* pQueuePair, BOOL SharedAddress,\r
-+ConnectQp(IUnknown* pQueuePair, BOOL SharedAddress,\r
-                 const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
-                 const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
-                 DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-@@ -167,7 +167,7 @@ out:
- }\r
- \r
- STDMETHODIMP CNDConnector::\r
--Connect(INDQueuePair* pQueuePair,\r
-+Connect(IUnknown* pQueuePair,\r
-               const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
-               const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
-               DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-@@ -179,7 +179,7 @@ Connect(INDQueuePair* pQueuePair,
- }\r
- \r
- STDMETHODIMP CNDConnector::\r
--ConnectSharedEndpoint(INDQueuePair* pQueuePair, INDSharedEndpoint* pSharedEndpoint,\r
-+ConnectSharedEndpoint(IUnknown* pQueuePair, IUnknown* pSharedEndpoint,\r
-                                         const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
-                                         DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-                                         const VOID* pPrivateData, DWORD cbPrivateData,\r
-@@ -204,7 +204,7 @@ CompleteConnect(OVERLAPPED* pOverlapped)
- }\r
- \r
- STDMETHODIMP CNDConnector::\r
--Accept(INDQueuePair* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-+Accept(IUnknown* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-          const VOID* pPrivateData, DWORD cbPrivateData, OVERLAPPED* pOverlapped)\r
- {\r
-       CNDQueuePair *qp = (CNDQueuePair *) pQueuePair;\r
-diff --git a/trunk/ulp/netdirect2/user/nd_connect.h b/trunk/ulp/netdirect2/user/nd_connect.h
-index ea2b12d..0140430 100644
---- a/trunk/ulp/netdirect2/user/nd_connect.h
-+++ b/trunk/ulp/netdirect2/user/nd_connect.h
-@@ -54,18 +54,18 @@ public:
-       STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);\r
- \r
-       // INDConnector methods\r
--      STDMETHODIMP Connect(INDQueuePair* pQueuePair,\r
-+      STDMETHODIMP Connect(IUnknown* pQueuePair,\r
-                                                const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
-                                                const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
-                                                DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-                                                const VOID* pPrivateData, DWORD cbPrivateData, OVERLAPPED* pOverlapped);\r
--      STDMETHODIMP ConnectSharedEndpoint(INDQueuePair* pQueuePair, INDSharedEndpoint* pSharedEndpoint,\r
-+      STDMETHODIMP ConnectSharedEndpoint(IUnknown* pQueuePair, IUnknown* pSharedEndpoint,\r
-                                                                          const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
-                                                                          DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-                                                                          const VOID* pPrivateData, DWORD cbPrivateData,\r
-                                                                          OVERLAPPED* pOverlapped);\r
-       STDMETHODIMP CompleteConnect(OVERLAPPED* pOverlapped);\r
--      STDMETHODIMP Accept(INDQueuePair* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-+      STDMETHODIMP Accept(IUnknown* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
-                                               const VOID* pPrivateData, DWORD cbPrivateData, OVERLAPPED* pOverlapped);\r
-       STDMETHODIMP Reject(const VOID* pPrivateData, DWORD cbPrivateData);\r
-       STDMETHODIMP GetConnectionData(DWORD* pInboundReadLimit, DWORD* pOutboundReadLimit,\r
-@@ -110,7 +110,7 @@ public:
- \r
- protected:\r
-       STDMETHODIMP            Init();\r
--      STDMETHODIMP            ConnectQp(INDQueuePair* pQueuePair, BOOL SharedAddress,\r
-+      STDMETHODIMP            ConnectQp(IUnknown* pQueuePair, BOOL SharedAddress,\r
-                                                                 const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
-                                                                 const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
-                                                                 DWORD inboundReadLimit, DWORD outboundReadLimit,

diff --git a/patches/cq b/patches/cq
deleted file mode 100644 (file)
index 9bdb88e..0000000
--- a/patches/cq
+++ /dev/null
@@ -1,41 +0,0 @@
-Bottom: 97ba8e4788f71ae084e14bc13f1dce86ada42600
-Top:    a276fef3b6e098d8e7f2202ffe8ea2193f2c2abe
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 23:04:54 -0700
-
-nd: update CQ APIs to latest spec
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_cq.cpp b/trunk/ulp/netdirect2/user/nd_cq.cpp
-index 9f8fdb6..be4b4bd 100644
---- a/trunk/ulp/netdirect2/user/nd_cq.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_cq.cpp
-@@ -98,6 +98,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
- }\r
- \r
- STDMETHODIMP CNDCompletionQueue::\r
-+GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity)\r
-+{\r
-+      return ND_NOT_SUPPORTED;\r
-+}\r
-+\r
-+STDMETHODIMP CNDCompletionQueue::\r
- Resize(DWORD queueDepth)\r
- {\r
-       HRESULT hr;\r
-diff --git a/trunk/ulp/netdirect2/user/nd_cq.h b/trunk/ulp/netdirect2/user/nd_cq.h
-index dcca211..fdadd98 100644
---- a/trunk/ulp/netdirect2/user/nd_cq.h
-+++ b/trunk/ulp/netdirect2/user/nd_cq.h
-@@ -50,6 +50,7 @@ public:
-       STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);\r
- \r
-       // INDCompletionQueue methods\r
-+      STDMETHODIMP GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity);\r
-       STDMETHODIMP Resize(DWORD queueDepth);\r
-       STDMETHODIMP Notify(DWORD type, OVERLAPPED* pOverlapped);\r
-       STDMETHODIMP_(DWORD) GetResults(ND_RESULT results[], DWORD nResults);

diff --git a/patches/listen b/patches/listen
deleted file mode 100644 (file)
index bf889fe..0000000
--- a/patches/listen
+++ /dev/null
@@ -1,38 +0,0 @@
-Bottom: 0ca9fd78b84f9573a379879c2f8324e3a66efde0
-Top:    ef95c29c42cccad6af3a85874d8b5c29bc975e58
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 17:39:07 -0700
-
-nd: update listen API to match latest spec
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_listen.cpp b/trunk/ulp/netdirect2/user/nd_listen.cpp
-index 80d1725..ee22540 100644
---- a/trunk/ulp/netdirect2/user/nd_listen.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_listen.cpp
-@@ -144,7 +144,7 @@ GetLocalAddress(struct sockaddr* pAddress, SIZE_T* pcbAddress)
- }\r
- \r
- STDMETHODIMP CNDListen::\r
--GetConnectionRequest(INDConnector* pConnector, OVERLAPPED* pOverlapped)\r
-+GetConnectionRequest(IUnknown* pConnector, OVERLAPPED* pOverlapped)\r
- {\r
-       CNDConnector *conn = (CNDConnector *) pConnector;\r
-       HRESULT hr;\r
-diff --git a/trunk/ulp/netdirect2/user/nd_listen.h b/trunk/ulp/netdirect2/user/nd_listen.h
-index 83a5b86..08f2d01 100644
---- a/trunk/ulp/netdirect2/user/nd_listen.h
-+++ b/trunk/ulp/netdirect2/user/nd_listen.h
-@@ -52,7 +52,7 @@ public:
-       // INDListen methods\r
-       STDMETHODIMP Listen(const struct sockaddr* pAddress, SIZE_T cbAddress, SIZE_T backlog);\r
-       STDMETHODIMP GetLocalAddress(struct sockaddr* pAddress, SIZE_T* pcbAddress);\r
--      STDMETHODIMP GetConnectionRequest(INDConnector* pConnector, OVERLAPPED* pOverlapped);\r
-+      STDMETHODIMP GetConnectionRequest(IUnknown* pConnector, OVERLAPPED* pOverlapped);\r
- \r
-       CNDListen(CNDAdapter *pAdapter);\r
-       ~CNDListen();

diff --git a/patches/nd-api b/patches/nd-api
deleted file mode 100644 (file)
index 51a5234..0000000
--- a/patches/nd-api
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 9f0960278ab368b09d2513dcbbb3b854c4c4dd49
-Top:    53aff3edd1e97b7d28aec254d87ee6d655621d3a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 23:34:49 -0700
-
-ND: update ND_ADAPTER_INFO structure members to latest ndspi.h file
-
-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 aa4cb92..f5475e3 100644
---- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -141,10 +141,10 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
-     pInfo->MaxTransferLength          = 1 << 31;\r
-       pInfo->MaxInboundReadLimit              = (DWORD) attr.MaxQpResponderResources;\r
-       pInfo->MaxOutboundReadLimit             = (DWORD) attr.MaxQpInitiatorDepth;\r
--    pInfo->MaxRQDepth                         = (DWORD) attr.MaxQpWr;\r
--    pInfo->MaxIQDepth                         = (DWORD) attr.MaxQpWr;\r
--    pInfo->MaxSRQDepth                                = (DWORD) attr.MaxSrqWr;\r
--    pInfo->MaxCQDepth                         = (DWORD) attr.MaxCqEntries;\r
-+    pInfo->MaxReceiveQueueDepth               = (DWORD) attr.MaxQpWr;\r
-+    pInfo->MaxInitiatorQueueDepth     = (DWORD) attr.MaxQpWr;\r
-+    pInfo->MaxSharedReceiveQueueDepth = (DWORD) attr.MaxSrqWr;\r
-+    pInfo->MaxCompletionQueueDepth    = (DWORD) attr.MaxCqEntries;\r
-     pInfo->InlineRequestThreshold     = m_MaxInlineSend;\r
-     pInfo->LargeRequestThreshold      = 0;\r
-       pInfo->MaxCallerData                    = ND_PRIVATE_DATA_SIZE;

diff --git a/patches/nd2 b/patches/nd2
index f1f41673f6a85f8b6ddd6fd1027b17a00d6357d5..402e1e1cb10ed879699a3fb0f298185c1230a8d8 100644 (file)
--- a/patches/nd2
+++ b/patches/nd2
@@ -1,7 +1,7 @@
 Bottom: 06cdce656914daffeb60188020c0cbccef3f6806
-Top:    0ca9fd78b84f9573a379879c2f8324e3a66efde0
+Top:    53aff3edd1e97b7d28aec254d87ee6d655621d3a
 Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-27 00:09:01 -0700
+Date:   2010-07-27 00:15:45 -0700
 
 nd2/provide: update provider APIs to match latest spec
 
@@ -10,9 +10,24 @@ 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 475c1e6..aa4cb92 100644
+index 475c1e6..f5475e3 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
+@@ -141,10 +141,10 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
+     pInfo->MaxTransferLength          = 1 << 31;\r
+       pInfo->MaxInboundReadLimit              = (DWORD) attr.MaxQpResponderResources;\r
+       pInfo->MaxOutboundReadLimit             = (DWORD) attr.MaxQpInitiatorDepth;\r
+-    pInfo->MaxRQDepth                         = (DWORD) attr.MaxQpWr;\r
+-    pInfo->MaxIQDepth                         = (DWORD) attr.MaxQpWr;\r
+-    pInfo->MaxSRQDepth                                = (DWORD) attr.MaxSrqWr;\r
+-    pInfo->MaxCQDepth                         = (DWORD) attr.MaxCqEntries;\r
++    pInfo->MaxReceiveQueueDepth               = (DWORD) attr.MaxQpWr;\r
++    pInfo->MaxInitiatorQueueDepth     = (DWORD) attr.MaxQpWr;\r
++    pInfo->MaxSharedReceiveQueueDepth = (DWORD) attr.MaxSrqWr;\r
++    pInfo->MaxCompletionQueueDepth    = (DWORD) attr.MaxCqEntries;\r
+     pInfo->InlineRequestThreshold     = m_MaxInlineSend;\r
+     pInfo->LargeRequestThreshold      = 0;\r
+       pInfo->MaxCallerData                    = ND_PRIVATE_DATA_SIZE;\r
 @@ -167,80 +167,112 @@ QueryAddressList(SOCKET_ADDRESS_LIST* pAddressList, SIZE_T* pcbAddressList)
  }\r
  \r
@@ -206,10 +221,72 @@ index 9821570..941f80a 100644
        {\r
                HRESULT hr;\r
                CNDAdapter *adapter;\r
+diff --git a/trunk/ulp/netdirect2/user/nd_connect.cpp b/trunk/ulp/netdirect2/user/nd_connect.cpp
+index 579fd11..7d9f71d 100644
+--- a/trunk/ulp/netdirect2/user/nd_connect.cpp
++++ b/trunk/ulp/netdirect2/user/nd_connect.cpp
+@@ -113,7 +113,7 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
+ }\r
+ \r
+ STDMETHODIMP CNDConnector::\r
+-ConnectQp(INDQueuePair* pQueuePair, BOOL SharedAddress,\r
++ConnectQp(IUnknown* pQueuePair, BOOL SharedAddress,\r
+                 const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
+                 const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
+                 DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+@@ -167,7 +167,7 @@ out:
+ }\r
+ \r
+ STDMETHODIMP CNDConnector::\r
+-Connect(INDQueuePair* pQueuePair,\r
++Connect(IUnknown* pQueuePair,\r
+               const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
+               const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
+               DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+@@ -179,7 +179,7 @@ Connect(INDQueuePair* pQueuePair,
+ }\r
+ \r
+ STDMETHODIMP CNDConnector::\r
+-ConnectSharedEndpoint(INDQueuePair* pQueuePair, INDSharedEndpoint* pSharedEndpoint,\r
++ConnectSharedEndpoint(IUnknown* pQueuePair, IUnknown* pSharedEndpoint,\r
+                                         const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
+                                         DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+                                         const VOID* pPrivateData, DWORD cbPrivateData,\r
+@@ -204,7 +204,7 @@ CompleteConnect(OVERLAPPED* pOverlapped)
+ }\r
+ \r
+ STDMETHODIMP CNDConnector::\r
+-Accept(INDQueuePair* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
++Accept(IUnknown* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+          const VOID* pPrivateData, DWORD cbPrivateData, OVERLAPPED* pOverlapped)\r
+ {\r
+       CNDQueuePair *qp = (CNDQueuePair *) pQueuePair;\r
 diff --git a/trunk/ulp/netdirect2/user/nd_connect.h b/trunk/ulp/netdirect2/user/nd_connect.h
-index dd1e142..ea2b12d 100644
+index dd1e142..0140430 100644
 --- a/trunk/ulp/netdirect2/user/nd_connect.h
 +++ b/trunk/ulp/netdirect2/user/nd_connect.h
+@@ -54,18 +54,18 @@ public:
+       STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);\r
+ \r
+       // INDConnector methods\r
+-      STDMETHODIMP Connect(INDQueuePair* pQueuePair,\r
++      STDMETHODIMP Connect(IUnknown* pQueuePair,\r
+                                                const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
+                                                const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
+                                                DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+                                                const VOID* pPrivateData, DWORD cbPrivateData, OVERLAPPED* pOverlapped);\r
+-      STDMETHODIMP ConnectSharedEndpoint(INDQueuePair* pQueuePair, INDSharedEndpoint* pSharedEndpoint,\r
++      STDMETHODIMP ConnectSharedEndpoint(IUnknown* pQueuePair, IUnknown* pSharedEndpoint,\r
+                                                                          const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
+                                                                          DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+                                                                          const VOID* pPrivateData, DWORD cbPrivateData,\r
+                                                                          OVERLAPPED* pOverlapped);\r
+       STDMETHODIMP CompleteConnect(OVERLAPPED* pOverlapped);\r
+-      STDMETHODIMP Accept(INDQueuePair* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
++      STDMETHODIMP Accept(IUnknown* pQueuePair, DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+                                               const VOID* pPrivateData, DWORD cbPrivateData, OVERLAPPED* pOverlapped);\r
+       STDMETHODIMP Reject(const VOID* pPrivateData, DWORD cbPrivateData);\r
+       STDMETHODIMP GetConnectionData(DWORD* pInboundReadLimit, DWORD* pOutboundReadLimit,\r
 @@ -79,7 +79,7 @@ public:
        ~CNDConnector();\r
        void Delete() {delete this;}\r
@@ -219,11 +296,45 @@ index dd1e142..ea2b12d 100644
        {\r
                HRESULT hr;\r
                CNDConnector *conn;\r
+@@ -110,7 +110,7 @@ public:
+ \r
+ protected:\r
+       STDMETHODIMP            Init();\r
+-      STDMETHODIMP            ConnectQp(INDQueuePair* pQueuePair, BOOL SharedAddress,\r
++      STDMETHODIMP            ConnectQp(IUnknown* pQueuePair, BOOL SharedAddress,\r
+                                                                 const struct sockaddr* pSrcAddress, SIZE_T cbSrcAddress,\r
+                                                                 const struct sockaddr* pDestAddress, SIZE_T cbDestAddress,\r
+                                                                 DWORD inboundReadLimit, DWORD outboundReadLimit,\r
+diff --git a/trunk/ulp/netdirect2/user/nd_cq.cpp b/trunk/ulp/netdirect2/user/nd_cq.cpp
+index 9f8fdb6..be4b4bd 100644
+--- a/trunk/ulp/netdirect2/user/nd_cq.cpp
++++ b/trunk/ulp/netdirect2/user/nd_cq.cpp
+@@ -98,6 +98,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
+ }\r
+ \r
+ STDMETHODIMP CNDCompletionQueue::\r
++GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity)\r
++{\r
++      return ND_NOT_SUPPORTED;\r
++}\r
++\r
++STDMETHODIMP CNDCompletionQueue::\r
+ Resize(DWORD queueDepth)\r
+ {\r
+       HRESULT hr;\r
 diff --git a/trunk/ulp/netdirect2/user/nd_cq.h b/trunk/ulp/netdirect2/user/nd_cq.h
-index 1f6af0e..dcca211 100644
+index 1f6af0e..fdadd98 100644
 --- a/trunk/ulp/netdirect2/user/nd_cq.h
 +++ b/trunk/ulp/netdirect2/user/nd_cq.h
-@@ -58,7 +58,7 @@ public:
+@@ -50,6 +50,7 @@ public:
+       STDMETHODIMP GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait);\r
+ \r
+       // INDCompletionQueue methods\r
++      STDMETHODIMP GetNotifyAffinity(USHORT* pGroup, KAFFINITY* pAffinity);\r
+       STDMETHODIMP Resize(DWORD queueDepth);\r
+       STDMETHODIMP Notify(DWORD type, OVERLAPPED* pOverlapped);\r
+       STDMETHODIMP_(DWORD) GetResults(ND_RESULT results[], DWORD nResults);\r
+@@ -58,7 +59,7 @@ public:
        ~CNDCompletionQueue();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
@@ -245,11 +356,31 @@ index e33df94..81ec189 100644
        {\r
                HRESULT hr;\r
                CNDSharedEndpoint *ep;\r
+diff --git a/trunk/ulp/netdirect2/user/nd_listen.cpp b/trunk/ulp/netdirect2/user/nd_listen.cpp
+index 80d1725..ee22540 100644
+--- a/trunk/ulp/netdirect2/user/nd_listen.cpp
++++ b/trunk/ulp/netdirect2/user/nd_listen.cpp
+@@ -144,7 +144,7 @@ GetLocalAddress(struct sockaddr* pAddress, SIZE_T* pcbAddress)
+ }\r
+ \r
+ STDMETHODIMP CNDListen::\r
+-GetConnectionRequest(INDConnector* pConnector, OVERLAPPED* pOverlapped)\r
++GetConnectionRequest(IUnknown* pConnector, OVERLAPPED* pOverlapped)\r
+ {\r
+       CNDConnector *conn = (CNDConnector *) pConnector;\r
+       HRESULT hr;\r
 diff --git a/trunk/ulp/netdirect2/user/nd_listen.h b/trunk/ulp/netdirect2/user/nd_listen.h
-index d077a3e..83a5b86 100644
+index d077a3e..08f2d01 100644
 --- a/trunk/ulp/netdirect2/user/nd_listen.h
 +++ b/trunk/ulp/netdirect2/user/nd_listen.h
-@@ -58,7 +58,7 @@ public:
+@@ -52,13 +52,13 @@ public:
+       // INDListen methods\r
+       STDMETHODIMP Listen(const struct sockaddr* pAddress, SIZE_T cbAddress, SIZE_T backlog);\r
+       STDMETHODIMP GetLocalAddress(struct sockaddr* pAddress, SIZE_T* pcbAddress);\r
+-      STDMETHODIMP GetConnectionRequest(INDConnector* pConnector, OVERLAPPED* pOverlapped);\r
++      STDMETHODIMP GetConnectionRequest(IUnknown* pConnector, OVERLAPPED* pOverlapped);\r
+ \r
+       CNDListen(CNDAdapter *pAdapter);\r
        ~CNDListen();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
@@ -345,10 +476,48 @@ index 15a74f6..b0e3709 100644
  \r
        CNDProvider();\r
        ~CNDProvider();\r
+diff --git a/trunk/ulp/netdirect2/user/nd_qp.cpp b/trunk/ulp/netdirect2/user/nd_qp.cpp
+index 6473540..746482f 100644
+--- a/trunk/ulp/netdirect2/user/nd_qp.cpp
++++ b/trunk/ulp/netdirect2/user/nd_qp.cpp
+@@ -192,8 +192,8 @@ Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE)
+ }\r
+ \r
+ STDMETHODIMP CNDQueuePair::\r
+-Bind(VOID* requestContext, INDMemoryRegion* pMemoryRegion,\r
+-       INDMemoryWindow* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
++Bind(VOID* requestContext, IUnknown* pMemoryRegion,\r
++       IUnknown* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
+        DWORD flags)\r
+ {\r
+       CNDMemoryRegion *mr = (CNDMemoryRegion *) pMemoryRegion;\r
+@@ -211,7 +211,7 @@ Bind(VOID* requestContext, INDMemoryRegion* pMemoryRegion,
+ }\r
+ \r
+ STDMETHODIMP CNDQueuePair::\r
+-Invalidate(VOID* requestContext, INDMemoryWindow* pMemoryWindow, DWORD flags)\r
++Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags)\r
+ {\r
+       CNDMemoryWindow *mw = (CNDMemoryWindow *) pMemoryWindow;\r
+       HRESULT hr;\r
 diff --git a/trunk/ulp/netdirect2/user/nd_qp.h b/trunk/ulp/netdirect2/user/nd_qp.h
-index 1d09ddc..3ce320f 100644
+index 1d09ddc..c110cce 100644
 --- a/trunk/ulp/netdirect2/user/nd_qp.h
 +++ b/trunk/ulp/netdirect2/user/nd_qp.h
+@@ -52,10 +52,10 @@ public:
+       STDMETHODIMP Flush();\r
+       STDMETHODIMP Send(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, DWORD flags);\r
+       STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE);\r
+-      STDMETHODIMP Bind(VOID* requestContext, INDMemoryRegion* pMemoryRegion,\r
+-                                        INDMemoryWindow* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
++      STDMETHODIMP Bind(VOID* requestContext, IUnknown* pMemoryRegion,\r
++                                        IUnknown* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
+                                         DWORD flags);\r
+-      STDMETHODIMP Invalidate(VOID* requestContext, INDMemoryWindow* pMemoryWindow, DWORD flags);\r
++      STDMETHODIMP Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags);\r
+       STDMETHODIMP Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,\r
+                                         UINT64 remoteAddress, UINT32 remoteToken, DWORD flags);\r
+       STDMETHODIMP Write(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,\r
 @@ -71,7 +71,7 @@ public:
                                   CNDSharedReceiveQueue *pSharedReceiveQueue,\r
                                   VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r

diff --git a/patches/qp b/patches/qp
deleted file mode 100644 (file)
index f6fe496..0000000
--- a/patches/qp
+++ /dev/null
@@ -1,54 +0,0 @@
-Bottom: a276fef3b6e098d8e7f2202ffe8ea2193f2c2abe
-Top:    9f0960278ab368b09d2513dcbbb3b854c4c4dd49
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 23:13:21 -0700
-
-nd: update QP API to match latest spec
-
-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 6473540..746482f 100644
---- a/trunk/ulp/netdirect2/user/nd_qp.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_qp.cpp
-@@ -192,8 +192,8 @@ Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE)
- }\r
- \r
- STDMETHODIMP CNDQueuePair::\r
--Bind(VOID* requestContext, INDMemoryRegion* pMemoryRegion,\r
--       INDMemoryWindow* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
-+Bind(VOID* requestContext, IUnknown* pMemoryRegion,\r
-+       IUnknown* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
-        DWORD flags)\r
- {\r
-       CNDMemoryRegion *mr = (CNDMemoryRegion *) pMemoryRegion;\r
-@@ -211,7 +211,7 @@ Bind(VOID* requestContext, INDMemoryRegion* pMemoryRegion,
- }\r
- \r
- STDMETHODIMP CNDQueuePair::\r
--Invalidate(VOID* requestContext, INDMemoryWindow* pMemoryWindow, DWORD flags)\r
-+Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags)\r
- {\r
-       CNDMemoryWindow *mw = (CNDMemoryWindow *) pMemoryWindow;\r
-       HRESULT hr;\r
-diff --git a/trunk/ulp/netdirect2/user/nd_qp.h b/trunk/ulp/netdirect2/user/nd_qp.h
-index 3ce320f..c110cce 100644
---- a/trunk/ulp/netdirect2/user/nd_qp.h
-+++ b/trunk/ulp/netdirect2/user/nd_qp.h
-@@ -52,10 +52,10 @@ public:
-       STDMETHODIMP Flush();\r
-       STDMETHODIMP Send(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, DWORD flags);\r
-       STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE);\r
--      STDMETHODIMP Bind(VOID* requestContext, INDMemoryRegion* pMemoryRegion,\r
--                                        INDMemoryWindow* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
-+      STDMETHODIMP Bind(VOID* requestContext, IUnknown* pMemoryRegion,\r
-+                                        IUnknown* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
-                                         DWORD flags);\r
--      STDMETHODIMP Invalidate(VOID* requestContext, INDMemoryWindow* pMemoryWindow, DWORD flags);\r
-+      STDMETHODIMP Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags);\r
-       STDMETHODIMP Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,\r
-                                         UINT64 remoteAddress, UINT32 remoteToken, DWORD flags);\r
-       STDMETHODIMP Write(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,