Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8108d68 authored by Roland Dreier's avatar Roland Dreier
Browse files

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

parents 52439540 e4221314 30ab7e23

drivers/infiniband/hw/mthca/mthca_mr.c

+1 −1
Original line number Diff line number Diff line
@@ -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 *),

			      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);

	if (!buddy->bits || !buddy->num_free)

		goto err_out;

drivers/infiniband/hw/qib/qib_rc.c

+3 −7
Original line number Diff line number Diff line
@@ -271,13 +271,9 @@ int qib_make_rc_req(struct qib_qp *qp) 
			goto bail;

		}

		wqe = get_swqe_ptr(qp, qp->s_last);

		while (qp->s_last != qp->s_acked) {

			qib_send_complete(qp, wqe, IB_WC_SUCCESS);

			if (++qp->s_last >= qp->s_size)

				qp->s_last = 0;

			wqe = get_swqe_ptr(qp, qp->s_last);

		}

		qib_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);

		qib_send_complete(qp, wqe, qp->s_last != qp->s_acked ?

			IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);

		/* will get called again */

		goto done;

	}