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

Commit 3fba2317 authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds
Browse files

[PATCH] IB/mthca: fix posting sends with immediate data 



When posting a work request with immediate data, put the immediate data in the
immediate data field of the hardware's work request (rather than overwriting
the flags field).

Signed-off-by: default avatarRoland Dreier <roland@topspin.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 17ead2f5

drivers/infiniband/hw/mthca/mthca_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -1465,7 +1465,7 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
			cpu_to_be32(1);

		if (wr->opcode == IB_WR_SEND_WITH_IMM ||

		    wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM)

			((struct mthca_next_seg *) wqe)->flags = wr->imm_data;

			((struct mthca_next_seg *) wqe)->imm = wr->imm_data;



		wqe += sizeof (struct mthca_next_seg);

		size = sizeof (struct mthca_next_seg) / 16;
@@ -1769,7 +1769,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
			cpu_to_be32(1);

		if (wr->opcode == IB_WR_SEND_WITH_IMM ||

		    wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM)

			((struct mthca_next_seg *) wqe)->flags = wr->imm_data;

			((struct mthca_next_seg *) wqe)->imm = wr->imm_data;



		wqe += sizeof (struct mthca_next_seg);

		size = sizeof (struct mthca_next_seg) / 16;