lkml.org 
[lkml]   [2006]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCHv2] IB/mthca: comment fix
    OK, this is fine with both Arjan van de Ven and Roland Dreier, so -
    Andrew, could you take this into -mm please?

    ---

    After recent changes, mthca_wq_init does not actually initialize the WQ as it
    used to - it simply resets all index fields to their initial values. So,
    let's rename it to mthca_wq_reset.

    Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>

    diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
    index 490fc78..cd8b672 100644
    --- a/drivers/infiniband/hw/mthca/mthca_qp.c
    +++ b/drivers/infiniband/hw/mthca/mthca_qp.c
    @@ -222,9 +222,8 @@ static void *get_send_wqe(struct mthca_q
    (PAGE_SIZE - 1));
    }

    -static void mthca_wq_init(struct mthca_wq *wq)
    +static void mthca_wq_reset(struct mthca_wq *wq)
    {
    - /* mthca_alloc_qp_common() initializes the locks */
    wq->next_ind = 0;
    wq->last_comp = wq->max - 1;
    wq->head = 0;
    @@ -845,10 +844,10 @@ int mthca_modify_qp(struct ib_qp *ibqp,
    mthca_cq_clean(dev, to_mcq(qp->ibqp.recv_cq), qp->qpn,
    qp->ibqp.srq ? to_msrq(qp->ibqp.srq) : NULL);

    - mthca_wq_init(&qp->sq);
    + mthca_wq_reset(&qp->sq);
    qp->sq.last = get_send_wqe(qp, qp->sq.max - 1);

    - mthca_wq_init(&qp->rq);
    + mthca_wq_reset(&qp->rq);
    qp->rq.last = get_recv_wqe(qp, qp->rq.max - 1);

    if (mthca_is_memfree(dev)) {
    @@ -1112,9 +1111,9 @@ static int mthca_alloc_qp_common(struct
    qp->atomic_rd_en = 0;
    qp->resp_depth = 0;
    qp->sq_policy = send_policy;
    - mthca_wq_init(&qp->sq);
    - mthca_wq_init(&qp->rq);
    - /* these are initialized separately so lockdep can tell them apart */
    + mthca_wq_reset(&qp->sq);
    + mthca_wq_reset(&qp->rq);
    +
    spin_lock_init(&qp->sq.lock);
    spin_lock_init(&qp->rq.lock);

    --
    MST
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-07-10 23:17    [W:0.025 / U:33.920 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site