[ofa-general] linux-next: infiniband build failure

[Stephen Rothwell]

Hi Roland,

Today's build of linux-next (powerpc ppc64_defconfig) produced this:

drivers/infiniband/hw/ehca/ehca_reqs.c: In function 'ehca_write_swqe':
drivers/infiniband/hw/ehca/ehca_reqs.c:191: error: 'const struct ib_send_wr' has no member named 'imm_data'

Caused by commit 0f2031b6374e693474f01020efeee6e9a00fa918 ("IB/core: Add
support for "send with invalidate" work requests").  I applied the patch
below but it would be good if it could be merged back into the above
commit.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From cb95023d10e3a6327b6b761f49f3e2e855882e57 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Fri, 4 Apr 2008 13:26:45 +1100
Subject: [PATCH] infiniband-fix-1

Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
 drivers/infiniband/hw/ehca/ehca_reqs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c
index 2ce8cff..784461d 100644
--- a/drivers/infiniband/hw/ehca/ehca_reqs.c
+++ b/drivers/infiniband/hw/ehca/ehca_reqs.c
@@ -188,7 +188,7 @@ static inline int ehca_write_swqe(struct ehca_qp *qp,
 	if (send_wr->opcode == IB_WR_SEND_WITH_IMM ||
 	    send_wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) {
 		/* this might not work as long as HW does not support it */
-		wqe_p->immediate_data = be32_to_cpu(send_wr->imm_data);
+		wqe_p->immediate_data = be32_to_cpu(send_wr->ex.imm_data);
 		wqe_p->wr_flag |= WQE_WRFLAG_IMM_DATA_PRESENT;
 	}
 
-- 
1.5.4.5