From 816f57f9fb3f9e776bde5f798551704180bbf010 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Wed, 6 Jun 2007 19:35:04 +0300 Subject: [PATCH] --- yaml --- r: 57595 b: refs/heads/master c: 57f01b53398baebd809e7efd49fc10c10174b46d h: refs/heads/master i: 57593: 169a020f7e870e1a7548ebed2c4c221315e1bd27 57591: ed5f4a6ea35f775eda142872960a9553e6f575c2 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mlx4/qp.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5214e428ea2c..5154c1337ebb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2d9308ae43a9cfa56cc9682dc6ed63347a8d2bf +refs/heads/master: 57f01b53398baebd809e7efd49fc10c10174b46d diff --git a/trunk/drivers/infiniband/hw/mlx4/qp.c b/trunk/drivers/infiniband/hw/mlx4/qp.c index dc137dec2308..cd2297586980 100644 --- a/trunk/drivers/infiniband/hw/mlx4/qp.c +++ b/trunk/drivers/infiniband/hw/mlx4/qp.c @@ -762,11 +762,6 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp, optpar |= MLX4_QP_OPTPAR_PKEY_INDEX; } - if (attr_mask & IB_QP_RNR_RETRY) { - context->params1 |= cpu_to_be32(attr->rnr_retry << 13); - optpar |= MLX4_QP_OPTPAR_RNR_RETRY; - } - if (attr_mask & IB_QP_AV) { if (mlx4_set_path(dev, &attr->ah_attr, &context->pri_path, attr_mask & IB_QP_PORT ? attr->port_num : qp->port)) { @@ -802,6 +797,12 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp, context->pd = cpu_to_be32(to_mpd(ibqp->pd)->pdn); context->params1 = cpu_to_be32(MLX4_IB_ACK_REQ_FREQ << 28); + + if (attr_mask & IB_QP_RNR_RETRY) { + context->params1 |= cpu_to_be32(attr->rnr_retry << 13); + optpar |= MLX4_QP_OPTPAR_RNR_RETRY; + } + if (attr_mask & IB_QP_RETRY_CNT) { context->params1 |= cpu_to_be32(attr->retry_cnt << 16); optpar |= MLX4_QP_OPTPAR_RETRY_COUNT;