Merge branch 'odp_fixes' into rdma.git for-next

[linux-2.6-block.git] / drivers / infiniband / hw / mlx5 / odp.c

diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index 762038ab83e290b2860cb45b324bdf0f40e6e0b8..817c924e72897bdaf968ef39a9e3bc1dc0d7c8be 100644 (file)
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -1004,9 +1004,6 @@ static int mlx5_ib_mr_initiator_pfault_handler(
        u32 transport_caps;
        struct mlx5_base_av *av;
        unsigned ds, opcode;
-#if defined(DEBUG)
-       u32 ctrl_wqe_index, ctrl_qpn;
-#endif
        u32 qpn = qp->trans_qp.base.mqp.qpn;
 
        ds = be32_to_cpu(ctrl->qpn_ds) & MLX5_WQE_CTRL_DS_MASK;
@@ -1022,27 +1019,6 @@ static int mlx5_ib_mr_initiator_pfault_handler(
                return -EFAULT;
        }
 
-#if defined(DEBUG)
-       ctrl_wqe_index = (be32_to_cpu(ctrl->opmod_idx_opcode) &
-                       MLX5_WQE_CTRL_WQE_INDEX_MASK) >>
-                       MLX5_WQE_CTRL_WQE_INDEX_SHIFT;
-       if (wqe_index != ctrl_wqe_index) {
-               mlx5_ib_err(dev, "Got WQE with invalid wqe_index. wqe_index=0x%x, qpn=0x%x ctrl->wqe_index=0x%x\n",
-                           wqe_index, qpn,
-                           ctrl_wqe_index);
-               return -EFAULT;
-       }
-
-       ctrl_qpn = (be32_to_cpu(ctrl->qpn_ds) & MLX5_WQE_CTRL_QPN_MASK) >>
-               MLX5_WQE_CTRL_QPN_SHIFT;
-       if (qpn != ctrl_qpn) {
-               mlx5_ib_err(dev, "Got WQE with incorrect QP number. wqe_index=0x%x, qpn=0x%x ctrl->qpn=0x%x\n",
-                           wqe_index, qpn,
-                           ctrl_qpn);
-               return -EFAULT;
-       }
-#endif /* DEBUG */
-
        *wqe_end = *wqe + ds * MLX5_WQE_DS_UNITS;
        *wqe += sizeof(*ctrl);