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 579fd11771cb9913faa68b77c25cc7fd840676c3..7d9f71df18b10041e1292792aec6345f3c0fa385 100644 (file)
--- 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 ea2b12d02c41286ca40bee29b38cb12b69f306b8..0140430b0d554517a21886ea699329c5cd3aa8fb 100644 (file)
--- 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,\r