Commit b8108d68 authored by Roland Dreier's avatar Roland Dreier

Merge branches 'iser', 'mthca' and 'qib' into for-next

...@@ -146,7 +146,7 @@ static int mthca_buddy_init(struct mthca_buddy *buddy, int max_order) ...@@ -146,7 +146,7 @@ static int mthca_buddy_init(struct mthca_buddy *buddy, int max_order)
buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *), buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),
GFP_KERNEL); GFP_KERNEL);
buddy->num_free = kzalloc((buddy->max_order + 1) * sizeof (int *), buddy->num_free = kcalloc((buddy->max_order + 1), sizeof *buddy->num_free,
GFP_KERNEL); GFP_KERNEL);
if (!buddy->bits || !buddy->num_free) if (!buddy->bits || !buddy->num_free)
goto err_out; goto err_out;
......
...@@ -271,13 +271,9 @@ int qib_make_rc_req(struct qib_qp *qp) ...@@ -271,13 +271,9 @@ int qib_make_rc_req(struct qib_qp *qp)
goto bail; goto bail;
} }
wqe = get_swqe_ptr(qp, qp->s_last); wqe = get_swqe_ptr(qp, qp->s_last);
while (qp->s_last != qp->s_acked) { qib_send_complete(qp, wqe, qp->s_last != qp->s_acked ?
qib_send_complete(qp, wqe, IB_WC_SUCCESS); IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);
if (++qp->s_last >= qp->s_size) /* will get called again */
qp->s_last = 0;
wqe = get_swqe_ptr(qp, qp->s_last);
}
qib_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);
goto done; goto done;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment