--- /dev/null
+Bottom: 344c98a32c2b2c258b8c3a8227419200ba30fd73
+Top: 664142911936cdb7ffd095f43e03553aafc57332
+Author: Sean Hefty <sean.hefty@intel.com>
+Date: 2010-07-26 16:43:24 -0700
+
+Refresh of sge
+
+---
+
+diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
+index 1e40058..7394144 100644
+--- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
++++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
+@@ -135,9 +135,9 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
+ pInfo->AdapterId = m_DeviceGuid;\r
+ pInfo->MaxRegistrationSize = attr.MaxMrSize;\r
+ pInfo->MaxWindowSize = attr.MaxMrSize;\r
+- pInfo->MaxReceiveSGE = (DWORD) attr.MaxSge;\r
+- pInfo->MaxInitiatorSGE = (DWORD) attr.MaxSge;\r
+- pInfo->MaxReadSGE = (DWORD) attr.MaxSge;\r
++ pInfo->MaxReceiveSge = (DWORD) attr.MaxSge;\r
++ pInfo->MaxInitiatorSge = (DWORD) attr.MaxSge;\r
++ pInfo->MaxReadSge = (DWORD) attr.MaxSge;\r
+ pInfo->MaxTransferLength = 1 << 31;\r
+ pInfo->MaxInboundReadLimit = (DWORD) attr.MaxQpResponderResources;\r
+ pInfo->MaxOutboundReadLimit = (DWORD) attr.MaxQpInitiatorDepth;\r
+diff --git a/trunk/ulp/netdirect2/user/nd_qp.cpp b/trunk/ulp/netdirect2/user/nd_qp.cpp
+index 6473540..d045d12 100644
+--- 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, INDMemoryWindow* 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 3ce320f..48adc80 100644
+--- 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, INDMemoryRegion* pMemoryRegion,\r
+ INDMemoryWindow* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,\r
+ DWORD flags);\r
+ STDMETHODIMP Invalidate(VOID* requestContext, INDMemoryWindow* 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 e472757..db96979 100644
+--- a/trunk/ulp/netdirect2/user/nd_srq.cpp
++++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
+@@ -119,10 +119,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 2693855..b748256 100644
+--- a/trunk/ulp/netdirect2/user/nd_srq.h
++++ b/trunk/ulp/netdirect2/user/nd_srq.h
+@@ -53,13 +53,13 @@ public:
+ // INDSharedReceiveQueue methods\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, GROUP_AFFINITY* pAffinity,\r
+ VOID** ppSharedReceiveQueue)\r
+ {\r
+@@ -72,7 +72,7 @@ public:
+ goto err1;\r
+ }\r
+ \r
+- hr = srq->Init(queueDepth, maxSGE, notifyThreshold, pAffinity);\r
++ hr = srq->Init(queueDepth, maxSge, notifyThreshold, pAffinity);\r
+ if (FAILED(hr)) {\r
+ goto err2;\r
+ }\r
+@@ -92,7 +92,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
+ GROUP_AFFINITY* pAffinity);\r
+ };