nd: convert use of SGE to Sge

The latest ND spec uses Sge instead of SGE.  Update the
implementation to match.

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 746482ffd7f9d72c5f2b6cc695fefce17c9e8197..c30579f5bb524137079c1d19665ca59540fed886 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_qp.cpp
+++ b/trunk/ulp/netdirect2/user/nd_qp.cpp
@@ -173,21 +173,21 @@ ConvertSendFlags(DWORD Flags)
 }\r
 \r
 STDMETHODIMP CNDQueuePair::\r
-Send(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, DWORD flags)\r
+Send(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, DWORD flags)\r
 {\r
        HRESULT hr;\r
 \r
-       hr = m_pWvQp->Send((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE,\r
+       hr = m_pWvQp->Send((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge,\r
                                           ConvertSendFlags(flags), 0);\r
        return NDConvertWVStatus(hr);\r
 }\r
 \r
 STDMETHODIMP CNDQueuePair::\r
-Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE)\r
+Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
 {\r
        HRESULT hr;\r
 \r
-       hr = m_pWvQp->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE);\r
+       hr = m_pWvQp->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);\r
        return NDConvertWVStatus(hr);\r
 }\r
 \r
@@ -224,25 +224,25 @@ Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags)
 }\r
 \r
 STDMETHODIMP CNDQueuePair::\r
-Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,\r
+Read(VOID* requestContext, const ND_SGE* pSge, DWORD nSge,\r
         UINT64 remoteAddress, UINT32 remoteToken, DWORD flags)\r
 {\r
        DWORD opts;\r
        HRESULT hr;\r
 \r
-       hr = m_pWvQp->Read((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE,\r
+       hr = m_pWvQp->Read((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge,\r
                                           ConvertSendFlags(flags), htonll(remoteAddress), remoteToken);\r
        return NDConvertWVStatus(hr);\r
 }\r
 \r
 STDMETHODIMP CNDQueuePair::\r
-Write(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,\r
+Write(VOID* requestContext, const ND_SGE* pSge, DWORD nSge,\r
          UINT64 remoteAddress, UINT32 remoteToken, DWORD flags)\r
 {\r
        DWORD opts;\r
        HRESULT hr;\r
 \r
-       hr = m_pWvQp->Write((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE,\r
+       hr = m_pWvQp->Write((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge,\r
                                            ConvertSendFlags(flags), 0, htonll(remoteAddress), remoteToken);\r
        return NDConvertWVStatus(hr);\r
 }\r

diff --git a/trunk/ulp/netdirect2/user/nd_qp.h b/trunk/ulp/netdirect2/user/nd_qp.h
index c110cce9658b5e0b60ba8e76d698f8859b40ea49..c986e847a2c2390baa162ba976768f5ae4f2c2ab 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_qp.h
+++ b/trunk/ulp/netdirect2/user/nd_qp.h
@@ -50,15 +50,15 @@ public:
 \r
        // INDQueuePair methods\r
        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 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, IUnknown* pMemoryRegion,\r
                                          IUnknown* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
                                          DWORD flags);\r
        STDMETHODIMP Invalidate(VOID* requestContext, IUnknown* pMemoryWindow, DWORD flags);\r
-       STDMETHODIMP Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,\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
+       STDMETHODIMP Write(VOID* requestContext, const ND_SGE* pSge, DWORD nSge,\r
                                           UINT64 remoteAddress, UINT32 remoteToken, DWORD flags);\r
        \r
        CNDQueuePair(CNDAdapter *pAdapter);\r
@@ -70,7 +70,7 @@ public:
                                   CNDCompletionQueue* pInitiatorCompletionQueue,\r
                                   CNDSharedReceiveQueue *pSharedReceiveQueue,\r
                                   VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r
-                                  DWORD maxReceiveRequestSGE, DWORD maxInitiatorRequestSGE,\r
+                                  DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge,\r
                                   VOID** ppQueuePair)\r
        {\r
                HRESULT hr;\r
@@ -84,7 +84,7 @@ public:
 \r
                hr = qp->Init(pReceiveCompletionQueue, pInitiatorCompletionQueue,\r
                                          pSharedReceiveQueue, context, receiveQueueDepth,\r
-                                         initiatorQueueDepth, maxReceiveRequestSGE, maxInitiatorRequestSGE);\r
+                                         initiatorQueueDepth, maxReceiveRequestSge, maxInitiatorRequestSge);\r
                if (FAILED(hr)) {\r
                        goto err2;\r
                }\r
@@ -111,7 +111,7 @@ protected:
                                          CNDCompletionQueue* pInitiatorCompletionQueue,\r
                                          CNDSharedReceiveQueue *pSharedReceiveQueue,\r
                                          VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth,\r
-                                         DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSGE);\r
+                                         DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge);\r
        STDMETHODIMP_(DWORD) ConvertSendFlags(DWORD Flags);\r
 };\r
 \r

diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
index ab0abd3f91c803d37cc0eaea4e7424d674b684c5..749961769ce5b6594f2b53fc2379d3ca6d443688 100644 (file)
--- a/trunk/ulp/netdirect2/user/nd_srq.cpp
+++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
@@ -124,10 +124,10 @@ Notify(OVERLAPPED* pOverlapped)
 }\r
 \r
 STDMETHODIMP CNDSharedReceiveQueue::\r
-Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE)\r
+Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
 {\r
        HRESULT hr;\r
 \r
-       hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE);\r
+       hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);\r
        return NDConvertWVStatus(hr);\r
 }\r

diff --git a/trunk/ulp/netdirect2/user/nd_srq.h b/trunk/ulp/netdirect2/user/nd_srq.h
index 79f3dc15761f36c8910b01f50b1d6d8dc2e3bb79..538403648834898533a741ccf2545bb4d33549bf 100644 (file)
--- 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);\r
        STDMETHODIMP Modify(DWORD queueDepth, DWORD notifyThreshold);\r
        STDMETHODIMP Notify(OVERLAPPED* pOverlapped);\r
-       STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE);\r
+       STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge);\r
 \r
        CNDSharedReceiveQueue(CNDAdapter *pAdapter);\r
        ~CNDSharedReceiveQueue();\r
        void Delete() {delete this;}\r
        static STDMETHODIMP\r
-       CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSGE,\r
+       CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSge,\r
                                   DWORD notifyThreshold, KAFFINITY affinity,\r
                                   VOID** ppSharedReceiveQueue)\r
        {\r
@@ -73,7 +73,7 @@ public:
                        goto err1;\r
                }\r
 \r
-               hr = srq->Init(queueDepth, maxSGE, notifyThreshold, affinity);\r
+               hr = srq->Init(queueDepth, maxSge, notifyThreshold, affinity);\r
                if (FAILED(hr)) {\r
                        goto err2;\r
                }\r
@@ -93,7 +93,7 @@ public:
 protected:\r
        CNDAdapter                              *m_pAdapter;\r
 \r
-       STDMETHODIMP Init(DWORD queueDepth, DWORD maxSGE, DWORD notifyThreshold,\r
+       STDMETHODIMP Init(DWORD queueDepth, DWORD maxSge, DWORD notifyThreshold,\r
                                          KAFFINITY affinity);\r
 };\r
 \r