The latest ND spec uses Sge instead of SGE. Update the internal use of SGE to match.
Signed-off-by: Sean Hefty <[email protected]> --- trunk/ulp/netdirect2/user/nd_qp.cpp | 16 ++++++++-------- trunk/ulp/netdirect2/user/nd_qp.h | 14 +++++++------- trunk/ulp/netdirect2/user/nd_srq.cpp | 4 ++-- trunk/ulp/netdirect2/user/nd_srq.h | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/trunk/ulp/netdirect2/user/nd_qp.cpp b/trunk/ulp/netdirect2/user/nd_qp.cpp index 746482f..c30579f 100644 --- a/trunk/ulp/netdirect2/user/nd_qp.cpp +++ b/trunk/ulp/netdirect2/user/nd_qp.cpp @@ -173,21 +173,21 @@ ConvertSendFlags(DWORD Flags) } STDMETHODIMP CNDQueuePair:: -Send(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, DWORD flags) +Send(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, DWORD flags) { HRESULT hr; - hr = m_pWvQp->Send((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE, + hr = m_pWvQp->Send((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge, ConvertSendFlags(flags), 0); return NDConvertWVStatus(hr); } STDMETHODIMP CNDQueuePair:: -Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE) +Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge) { HRESULT hr; - hr = m_pWvQp->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE); + hr = m_pWvQp->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge); return NDConvertWVStatus(hr); } @@ -224,25 +224,25 @@ Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags) } STDMETHODIMP CNDQueuePair:: -Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, +Read(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, UINT64 remoteAddress, UINT32 remoteToken, DWORD flags) { DWORD opts; HRESULT hr; - hr = m_pWvQp->Read((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE, + hr = m_pWvQp->Read((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge, ConvertSendFlags(flags), htonll(remoteAddress), remoteToken); return NDConvertWVStatus(hr); } STDMETHODIMP CNDQueuePair:: -Write(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, +Write(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, UINT64 remoteAddress, UINT32 remoteToken, DWORD flags) { DWORD opts; HRESULT hr; - hr = m_pWvQp->Write((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE, + hr = m_pWvQp->Write((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge, ConvertSendFlags(flags), 0, htonll(remoteAddress), remoteToken); return NDConvertWVStatus(hr); } diff --git a/trunk/ulp/netdirect2/user/nd_qp.h b/trunk/ulp/netdirect2/user/nd_qp.h index c110cce..c986e84 100644 --- a/trunk/ulp/netdirect2/user/nd_qp.h +++ b/trunk/ulp/netdirect2/user/nd_qp.h @@ -50,15 +50,15 @@ public: // INDQueuePair methods STDMETHODIMP Flush(); - STDMETHODIMP Send(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, DWORD flags); - STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE); + STDMETHODIMP Send(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, DWORD flags); + STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge); STDMETHODIMP Bind(VOID* requestContext, IUnknown* pMemoryRegion, IUnknown* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer, DWORD flags); STDMETHODIMP Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags); - STDMETHODIMP Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, + STDMETHODIMP Read(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, UINT64 remoteAddress, UINT32 remoteToken, DWORD flags); - STDMETHODIMP Write(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, + STDMETHODIMP Write(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, UINT64 remoteAddress, UINT32 remoteToken, DWORD flags); CNDQueuePair(CNDAdapter *pAdapter); @@ -70,7 +70,7 @@ public: CNDCompletionQueue* pInitiatorCompletionQueue, CNDSharedReceiveQueue *pSharedReceiveQueue, VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth, - DWORD maxReceiveRequestSGE, DWORD maxInitiatorRequestSGE, + DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge, VOID** ppQueuePair) { HRESULT hr; @@ -84,7 +84,7 @@ public: hr = qp->Init(pReceiveCompletionQueue, pInitiatorCompletionQueue, pSharedReceiveQueue, context, receiveQueueDepth, - initiatorQueueDepth, maxReceiveRequestSGE, maxInitiatorRequestSGE); + initiatorQueueDepth, maxReceiveRequestSge, maxInitiatorRequestSge); if (FAILED(hr)) { goto err2; } @@ -111,7 +111,7 @@ protected: CNDCompletionQueue* pInitiatorCompletionQueue, CNDSharedReceiveQueue *pSharedReceiveQueue, VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth, - DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSGE); + DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge); STDMETHODIMP_(DWORD) ConvertSendFlags(DWORD Flags); }; diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp index ab0abd3..7499617 100644 --- a/trunk/ulp/netdirect2/user/nd_srq.cpp +++ b/trunk/ulp/netdirect2/user/nd_srq.cpp @@ -124,10 +124,10 @@ Notify(OVERLAPPED* pOverlapped) } STDMETHODIMP CNDSharedReceiveQueue:: -Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE) +Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge) { HRESULT hr; - hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE); + hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge); return NDConvertWVStatus(hr); } diff --git a/trunk/ulp/netdirect2/user/nd_srq.h b/trunk/ulp/netdirect2/user/nd_srq.h index 79f3dc1..5384036 100644 --- a/trunk/ulp/netdirect2/user/nd_srq.h +++ b/trunk/ulp/netdirect2/user/nd_srq.h @@ -54,13 +54,13 @@ public: STDMETHODIMP GetNotifyAffinity(USHORT *pGroup, KAFFINITY* pAffinity); STDMETHODIMP Modify(DWORD queueDepth, DWORD notifyThreshold); STDMETHODIMP Notify(OVERLAPPED* pOverlapped); - STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE); + STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge); CNDSharedReceiveQueue(CNDAdapter *pAdapter); ~CNDSharedReceiveQueue(); void Delete() {delete this;} static STDMETHODIMP - CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSGE, + CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSge, DWORD notifyThreshold, KAFFINITY affinity, VOID** ppSharedReceiveQueue) { @@ -73,7 +73,7 @@ public: goto err1; } - hr = srq->Init(queueDepth, maxSGE, notifyThreshold, affinity); + hr = srq->Init(queueDepth, maxSge, notifyThreshold, affinity); if (FAILED(hr)) { goto err2; } @@ -93,7 +93,7 @@ public: protected: CNDAdapter *m_pAdapter; - STDMETHODIMP Init(DWORD queueDepth, DWORD maxSGE, DWORD notifyThreshold, + STDMETHODIMP Init(DWORD queueDepth, DWORD maxSge, DWORD notifyThreshold, KAFFINITY affinity); }; _______________________________________________ ofw mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ofw
