refresh

diff --git a/meta b/meta
index a1639781657126efe569b5980264f20e43a6e10c..5d702ac3d4b6bb75f836749fbf93067dd83b7d59 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 217fcd81033bdc576da3609cd7afcb116d09f843
-Head: 492134f3983ec8f0f9a11b14563e5ef337e7bca2
+Previous: a1ed65f0e551381fdaea536ea0e2c7e97fb76085
+Head: adbb8ebc8304351cf34a2712f8c8f6ecac123a68
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
@@ -11,8 +11,7 @@ Applied:
   sge: 84588550c84d1c3edae7eabcc0caad91e3b4c720
   mr: f0f29ddff87594005f8d03d6818d1b6f94e26eb3
   srq: a0e18f5f87d153199068cfcc8b434d94a7214f5d
-  srq-32: 29eedf4df4b309a4f14ba9db880b42216a98328f
-  refresh-temp: 492134f3983ec8f0f9a11b14563e5ef337e7bca2
+  srq-32: adbb8ebc8304351cf34a2712f8c8f6ecac123a68
 Unapplied:
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
   wv-ver: 9abd550558317c525e7f7f82caae75f1a810d2b7

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7dadddd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,69 +0,0 @@
-Bottom: 1214ea8df59afded7ce2e6ef1f4e6a53369da682
-Top:    8ee5a5642265ca85bedebfbdc0ed6abbc60eec06
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-26 17:37:33 -0700
-
-Refresh of srq-32
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
-index 7e97169..5d10de2 100644
---- a/trunk/ulp/netdirect2/user/nd_srq.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
-@@ -124,6 +124,16 @@ Notify(OVERLAPPED* pOverlapped)
-       return NDConvertWVStatus(hr);\r
- }\r
- \r
-+#ifdef _WIN64\r
-+\r
-+C_ASSERT(sizeof(WV_SGE) == sizeof(ND_SGE));\r
-+C_ASSERT(FIELD_OFFSET(WV_SGE, pAddress)   == FIELD_OFFSET(ND_SGE, Buffer));\r
-+C_ASSERT(RTL_FIELD_SIZE(WV_SGE, pAddress) == RTL_FIELD_SIZE(ND_SGE, Buffer));\r
-+C_ASSERT(FIELD_OFFSET(WV_SGE, Length)     == FIELD_OFFSET(ND_SGE, BufferLength));\r
-+C_ASSERT(RTL_FIELD_SIZE(WV_SGE, Length)   == RTL_FIELD_SIZE(ND_SGE, BufferLength));\r
-+C_ASSERT(FIELD_OFFSET(WV_SGE, Lkey)       == FIELD_OFFSET(ND_SGE, MemoryRegionToken));\r
-+C_ASSERT(RTL_FIELD_SIZE(WV_SGE, Lkey)     == RTL_FIELD_SIZE(ND_SGE, MemoryRegionToken));\r
-+\r
- STDMETHODIMP CNDSharedReceiveQueue::\r
- Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
- {\r
-@@ -132,3 +142,37 @@ Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)
-       hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);\r
-       return NDConvertWVStatus(hr);\r
- }\r
-+\r
-+#else\r
-+\r
-+STDMETHODIMP CNDSharedReceiveQueue::\r
-+Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
-+{\r
-+      WV_SGE sge_array[4];\r
-+      WV_SGE *sge;\r
-+      DWORD i;\r
-+      HRESULT hr;\r
-+\r
-+      if (nSge > _countof(sge_array)) {\r
-+              sge = new WV_SGE[nSge];\r
-+              if (pShadowSge == NULL) {\r
-+                      return ND_NO_MEMORY;\r
-+              }\r
-+      } else {\r
-+              sge = sge_array;\r
-+      }\r
-+\r
-+      for (i = 0; i < nSge; i++) {\r
-+              sge->pAddress = pSge[i].Buffer;\r
-+              sge->Length = pSge[i].BufferLength;\r
-+              sge->Lkey = pSge[i].MemoryRegionToken;\r
-+      }\r
-+\r
-+      hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, sge, nSge);\r
-+      if (nSge > _countof(sge_array)) {\r
-+              delete[] sge;\r
-+      }\r
-+      return NDConvertWVStatus(hr);\r
-+}\r
-+\r
-+#endif
-\ No newline at end of file

diff --git a/patches/srq-32 b/patches/srq-32
index 2e34c6a57703a564853d5cd6301cf5170bce03d4..258fbdc56a89c5ebfd9d06ec4102d12c91bd6d5d 100644 (file)
--- a/patches/srq-32
+++ b/patches/srq-32
@@ -1,5 +1,5 @@
 Bottom: 1214ea8df59afded7ce2e6ef1f4e6a53369da682
-Top:    1214ea8df59afded7ce2e6ef1f4e6a53369da682
+Top:    8ee5a5642265ca85bedebfbdc0ed6abbc60eec06
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 17:30:12 -0700
 
@@ -16,4 +16,63 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
+index 7e97169..5d10de2 100644
+--- a/trunk/ulp/netdirect2/user/nd_srq.cpp
++++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
+@@ -124,6 +124,16 @@ Notify(OVERLAPPED* pOverlapped)
+       return NDConvertWVStatus(hr);\r
+ }\r
+ \r
++#ifdef _WIN64\r
++\r
++C_ASSERT(sizeof(WV_SGE) == sizeof(ND_SGE));\r
++C_ASSERT(FIELD_OFFSET(WV_SGE, pAddress)   == FIELD_OFFSET(ND_SGE, Buffer));\r
++C_ASSERT(RTL_FIELD_SIZE(WV_SGE, pAddress) == RTL_FIELD_SIZE(ND_SGE, Buffer));\r
++C_ASSERT(FIELD_OFFSET(WV_SGE, Length)     == FIELD_OFFSET(ND_SGE, BufferLength));\r
++C_ASSERT(RTL_FIELD_SIZE(WV_SGE, Length)   == RTL_FIELD_SIZE(ND_SGE, BufferLength));\r
++C_ASSERT(FIELD_OFFSET(WV_SGE, Lkey)       == FIELD_OFFSET(ND_SGE, MemoryRegionToken));\r
++C_ASSERT(RTL_FIELD_SIZE(WV_SGE, Lkey)     == RTL_FIELD_SIZE(ND_SGE, MemoryRegionToken));\r
++\r
+ STDMETHODIMP CNDSharedReceiveQueue::\r
+ Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
+ {\r
+@@ -132,3 +142,37 @@ Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)
+       hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);\r
+       return NDConvertWVStatus(hr);\r
+ }\r
++\r
++#else\r
++\r
++STDMETHODIMP CNDSharedReceiveQueue::\r
++Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
++{\r
++      WV_SGE sge_array[4];\r
++      WV_SGE *sge;\r
++      DWORD i;\r
++      HRESULT hr;\r
++\r
++      if (nSge > _countof(sge_array)) {\r
++              sge = new WV_SGE[nSge];\r
++              if (pShadowSge == NULL) {\r
++                      return ND_NO_MEMORY;\r
++              }\r
++      } else {\r
++              sge = sge_array;\r
++      }\r
++\r
++      for (i = 0; i < nSge; i++) {\r
++              sge->pAddress = pSge[i].Buffer;\r
++              sge->Length = pSge[i].BufferLength;\r
++              sge->Lkey = pSge[i].MemoryRegionToken;\r
++      }\r
++\r
++      hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, sge, nSge);\r
++      if (nSge > _countof(sge_array)) {\r
++              delete[] sge;\r
++      }\r
++      return NDConvertWVStatus(hr);\r
++}\r
++\r
++#endif
+\ No newline at end of file