[nd] Don't use inline for RDMA reads. (mlnx 5666)
authortzachid <tzachid@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 10 Mar 2010 10:04:03 +0000 (10:04 +0000)
committertzachid <tzachid@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 10 Mar 2010 10:04:03 +0000 (10:04 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2727 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

hw/mlx4/user/hca/cq.c
ulp/nd/user/NdEndpoint.cpp

index a224ebb..24d2f56 100644 (file)
@@ -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 "\r
                       "(QPN %06x, WQE index %x, vendor syndrome %02x, "\r
                       "opcode = %02x)\n",\r
-                      htonl(cqe->my_qpn), htonl(cqe->wqe_index),\r
+                      htonl(cqe->my_qpn), htons(cqe->wqe_index),\r
                       cqe->vendor_err,\r
                       cqe->owner_sr_opcode & ~MLX4_CQE_OWNER_MASK);\r
 \r
index b204320..9d322d3 100644 (file)
@@ -686,10 +686,10 @@ HRESULT CEndpoint::Rdma(
     wr.p_next = NULL;\r
     wr.wr_id = (ULONG_PTR)pResult;\r
     wr.wr_type = Type;\r
-    if ( pResult->BytesTransferred <= m_MaxInlineSize )\r
-           wr.send_opt = IB_SEND_OPT_INLINE; \r
-       else\r
-           wr.send_opt = 0;\r
+    if ( (pResult->BytesTransferred <= m_MaxInlineSize) && Type != WR_RDMA_READ)\r
+        wr.send_opt = IB_SEND_OPT_INLINE; \r
+    else\r
+        wr.send_opt = 0;\r
     if( !(Flags & ND_OP_FLAG_SILENT_SUCCESS) )\r
         wr.send_opt |= IB_SEND_OPT_SIGNALED;\r
     if( Flags & ND_OP_FLAG_READ_FENCE )\r