refresh

diff --git a/meta b/meta
index 360b851f46251cee48b01cfcdda052b7f4cbd8d2..3f34be76a85fe5d19c04c4b562f913b7fc7be33a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 38d0ac7f4fc3710e80102a44f54627728b40fe9a
-Head: 8e647e44ecc23e2b27048f4b00d1f9cc4366ca75
+Previous: 8703cfb0d9b5322b6689abc84508ac8c82c63959
+Head: 0ae534ec357c8cd547c5293c0fea21b1dd8099e0
 Applied:
   rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
   port_attr: 6cb488a1a7ddc36e7017499d52152f0267669e02
@@ -9,8 +9,7 @@ Applied:
   nd-conn: 07e99cfc4b3c927361925d099215dd15d008f5c5
   nd-status: a1f7a8e10f4072b483c67571f2f08108babd1a57
   ep-disc: 01ba67c5f246a6132f2f9c50dfe27145293b6b13
-  nd-read: 437dea9b5fc05cf422703a778d78375f1be59785
-  refresh-temp: 8e647e44ecc23e2b27048f4b00d1f9cc4366ca75
+  nd-read: 0ae534ec357c8cd547c5293c0fea21b1dd8099e0
 Unapplied:
   dapl-rb: 1aa0b9f57f7544c8a16f73608547f6c76af64fb9
   debug-wv: f98e9be2365ed35d30abdf31128c331322849c93

diff --git a/patches/nd-read b/patches/nd-read
index 62816827e211fe2fe404768272cfdd6531ddb383..2737468a4c04e5848f0cbbdcdc4b08de14635f6a 100644 (file)
--- a/patches/nd-read
+++ b/patches/nd-read
@@ -1,5 +1,5 @@
 Bottom: 0e2449003ef82541d904876fde61aba51cd7a54a
-Top:    0e2449003ef82541d904876fde61aba51cd7a54a
+Top:    2586ba9029b17fa3e8628f7a343ca9641a7bad52
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-03-09 10:24:22 -0800
 
@@ -12,4 +12,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/netdirect/user/nd_ep.cpp b/trunk/ulp/netdirect/user/nd_ep.cpp
+index 7060b20..05fa6dd 100644
+--- a/trunk/ulp/netdirect/user/nd_ep.cpp
++++ b/trunk/ulp/netdirect/user/nd_ep.cpp
+@@ -291,8 +291,7 @@ Read(ND_RESULT* pResult, const ND_SGE* pSgl, SIZE_T nSge,
+       HRESULT hr;\r
+ \r
+       pResult->BytesTransferred = ConvertSgl(pSgl, nSge, sgl);\r
+-      opts = ConvertSendFlags(Flags) |\r
+-                 (pResult->BytesTransferred ? 0 : WV_SEND_INLINE);\r
++      opts = ConvertSendFlags(Flags);\r
+       addr = ntohll(pRemoteMwDescriptor->Base) + Offset;\r
+       hr = m_pWvQp->Read((UINT64) pResult, sgl, nSge, opts,\r
+                                          htonll(addr), pRemoteMwDescriptor->Token);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4952fb4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 0e2449003ef82541d904876fde61aba51cd7a54a
-Top:    2586ba9029b17fa3e8628f7a343ca9641a7bad52
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-03-09 10:26:17 -0800
-
-Refresh of nd-read
-
----
-
-diff --git a/trunk/ulp/netdirect/user/nd_ep.cpp b/trunk/ulp/netdirect/user/nd_ep.cpp
-index 7060b20..05fa6dd 100644
---- a/trunk/ulp/netdirect/user/nd_ep.cpp
-+++ b/trunk/ulp/netdirect/user/nd_ep.cpp
-@@ -291,8 +291,7 @@ Read(ND_RESULT* pResult, const ND_SGE* pSgl, SIZE_T nSge,
-       HRESULT hr;\r
- \r
-       pResult->BytesTransferred = ConvertSgl(pSgl, nSge, sgl);\r
--      opts = ConvertSendFlags(Flags) |\r
--                 (pResult->BytesTransferred ? 0 : WV_SEND_INLINE);\r
-+      opts = ConvertSendFlags(Flags);\r
-       addr = ntohll(pRemoteMwDescriptor->Base) + Offset;\r
-       hr = m_pWvQp->Read((UINT64) pResult, sgl, nSge, opts,\r
-                                          htonll(addr), pRemoteMwDescriptor->Token);