From d7c884385dfd4c51711234050a53dfa43d7f415b Mon Sep 17 00:00:00 2001 From: tzachid Date: Wed, 10 Mar 2010 10:04:03 +0000 Subject: [PATCH] [nd] Don't use inline for RDMA reads. (mlnx 5666) git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2727 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- hw/mlx4/user/hca/cq.c | 2 +- ulp/nd/user/NdEndpoint.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/mlx4/user/hca/cq.c b/hw/mlx4/user/hca/cq.c index a224ebb8..24d2f560 100644 --- a/hw/mlx4/user/hca/cq.c +++ b/hw/mlx4/user/hca/cq.c @@ -130,7 +130,7 @@ static void mlx4_handle_error_cqe(struct mlx4_err_cqe *cqe, ib_wc_t *wc) printf(PFX "local QP operation err " "(QPN %06x, WQE index %x, vendor syndrome %02x, " "opcode = %02x)\n", - htonl(cqe->my_qpn), htonl(cqe->wqe_index), + htonl(cqe->my_qpn), htons(cqe->wqe_index), cqe->vendor_err, cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK); diff --git a/ulp/nd/user/NdEndpoint.cpp b/ulp/nd/user/NdEndpoint.cpp index b204320f..9d322d38 100644 --- a/ulp/nd/user/NdEndpoint.cpp +++ b/ulp/nd/user/NdEndpoint.cpp @@ -686,10 +686,10 @@ HRESULT CEndpoint::Rdma( wr.p_next = NULL; wr.wr_id = (ULONG_PTR)pResult; wr.wr_type = Type; - if ( pResult->BytesTransferred <= m_MaxInlineSize ) - wr.send_opt = IB_SEND_OPT_INLINE; - else - wr.send_opt = 0; + if ( (pResult->BytesTransferred <= m_MaxInlineSize) && Type != WR_RDMA_READ) + wr.send_opt = IB_SEND_OPT_INLINE; + else + wr.send_opt = 0; if( !(Flags & ND_OP_FLAG_SILENT_SUCCESS) ) wr.send_opt |= IB_SEND_OPT_SIGNALED; if( Flags & ND_OP_FLAG_READ_FENCE ) -- 2.17.1