From 1148cb39c99cb171c293868898dd568b99466040 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 9 Mar 2010 10:26:20 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 35496847..360b851f 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: f619ab0d376563207249fe5c539da970e6ae1fc7 -Head: 437dea9b5fc05cf422703a778d78375f1be59785 +Previous: 38d0ac7f4fc3710e80102a44f54627728b40fe9a +Head: 8e647e44ecc23e2b27048f4b00d1f9cc4366ca75 Applied: rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a port_attr: 6cb488a1a7ddc36e7017499d52152f0267669e02 @@ -10,6 +10,7 @@ Applied: nd-status: a1f7a8e10f4072b483c67571f2f08108babd1a57 ep-disc: 01ba67c5f246a6132f2f9c50dfe27145293b6b13 nd-read: 437dea9b5fc05cf422703a778d78375f1be59785 + refresh-temp: 8e647e44ecc23e2b27048f4b00d1f9cc4366ca75 Unapplied: dapl-rb: 1aa0b9f57f7544c8a16f73608547f6c76af64fb9 debug-wv: f98e9be2365ed35d30abdf31128c331322849c93 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..4952fb4d --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,23 @@ +Bottom: 0e2449003ef82541d904876fde61aba51cd7a54a +Top: 2586ba9029b17fa3e8628f7a343ca9641a7bad52 +Author: Sean Hefty +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; + + pResult->BytesTransferred = ConvertSgl(pSgl, nSge, sgl); +- opts = ConvertSendFlags(Flags) | +- (pResult->BytesTransferred ? 0 : WV_SEND_INLINE); ++ opts = ConvertSendFlags(Flags); + addr = ntohll(pRemoteMwDescriptor->Base) + Offset; + hr = m_pWvQp->Read((UINT64) pResult, sgl, nSge, opts, + htonll(addr), pRemoteMwDescriptor->Token); -- 2.46.0