diff options
author | Roland Dreier <roland@topspin.com> | 2005-04-16 18:26:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:26:16 -0400 |
commit | 3fba231754eef768f6ca83900b726ecf4bc9dc5f (patch) | |
tree | 21db9238e859232257294b75e541737ee123e270 /drivers/infiniband | |
parent | 17ead2f5cc81c4658e7b495014c2c6856a6f6b88 (diff) |
[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: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_qp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c index 7e4bbbd31f07..1992effe3f8b 100644 --- a/drivers/infiniband/hw/mthca/mthca_qp.c +++ b/drivers/infiniband/hw/mthca/mthca_qp.c | |||
@@ -1465,7 +1465,7 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
1465 | cpu_to_be32(1); | 1465 | cpu_to_be32(1); |
1466 | if (wr->opcode == IB_WR_SEND_WITH_IMM || | 1466 | if (wr->opcode == IB_WR_SEND_WITH_IMM || |
1467 | wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) | 1467 | wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) |
1468 | ((struct mthca_next_seg *) wqe)->flags = wr->imm_data; | 1468 | ((struct mthca_next_seg *) wqe)->imm = wr->imm_data; |
1469 | 1469 | ||
1470 | wqe += sizeof (struct mthca_next_seg); | 1470 | wqe += sizeof (struct mthca_next_seg); |
1471 | size = sizeof (struct mthca_next_seg) / 16; | 1471 | 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, | |||
1769 | cpu_to_be32(1); | 1769 | cpu_to_be32(1); |
1770 | if (wr->opcode == IB_WR_SEND_WITH_IMM || | 1770 | if (wr->opcode == IB_WR_SEND_WITH_IMM || |
1771 | wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) | 1771 | wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) |
1772 | ((struct mthca_next_seg *) wqe)->flags = wr->imm_data; | 1772 | ((struct mthca_next_seg *) wqe)->imm = wr->imm_data; |
1773 | 1773 | ||
1774 | wqe += sizeof (struct mthca_next_seg); | 1774 | wqe += sizeof (struct mthca_next_seg); |
1775 | size = sizeof (struct mthca_next_seg) / 16; | 1775 | size = sizeof (struct mthca_next_seg) / 16; |