4 files changed, 12 insertions, 12 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
index 467981905bb..c405dfba553 100644
--- a/drivers/infiniband/hw/ipath/ipath_rc.c
+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -308,7 +308,7 @@ int ipath_make_rc_req(struct ipath_qp *qp)
                         else {
                                 qp->s_state = OP(SEND_ONLY_WITH_IMMEDIATE);
                                 /* Immediate data comes after the BTH */
-                                ohdr->u.imm_data = wqe->wr.imm_data;
+                                ohdr->u.imm_data = wqe->wr.ex.imm_data;
                                 hwords += 1;
                         }
                         if (wqe->wr.send_flags & IB_SEND_SOLICITED)
@@ -346,7 +346,7 @@ int ipath_make_rc_req(struct ipath_qp *qp)
                                 qp->s_state =
                                         OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE);
                                 /* Immediate data comes after RETH */
-                                ohdr->u.rc.imm_data = wqe->wr.imm_data;
+                                ohdr->u.rc.imm_data = wqe->wr.ex.imm_data;
                                 hwords += 1;
                                 if (wqe->wr.send_flags & IB_SEND_SOLICITED)
                                         bth0 |= 1 << 23;
@@ -490,7 +490,7 @@ int ipath_make_rc_req(struct ipath_qp *qp)
                 else {
                         qp->s_state = OP(SEND_LAST_WITH_IMMEDIATE);
                         /* Immediate data comes after the BTH */
-                        ohdr->u.imm_data = wqe->wr.imm_data;
+                        ohdr->u.imm_data = wqe->wr.ex.imm_data;
                         hwords += 1;
                 }
                 if (wqe->wr.send_flags & IB_SEND_SOLICITED)
@@ -526,7 +526,7 @@ int ipath_make_rc_req(struct ipath_qp *qp)
                 else {
                         qp->s_state = OP(RDMA_WRITE_LAST_WITH_IMMEDIATE);
                         /* Immediate data comes after the BTH */
-                        ohdr->u.imm_data = wqe->wr.imm_data;
+                        ohdr->u.imm_data = wqe->wr.ex.imm_data;
                         hwords += 1;
                         if (wqe->wr.send_flags & IB_SEND_SOLICITED)
                                 bth0 |= 1 << 23;
diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
index bcaa2914e34..8ac5c1d82cc 100644
--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
@@ -310,7 +310,7 @@ again:
         switch (wqe->wr.opcode) {
         case IB_WR_SEND_WITH_IMM:
                 wc.wc_flags = IB_WC_WITH_IMM;
-                wc.imm_data = wqe->wr.imm_data;
+                wc.imm_data = wqe->wr.ex.imm_data;
                 /* FALLTHROUGH */
         case IB_WR_SEND:
                 if (!ipath_get_rwqe(qp, 0)) {
@@ -339,7 +339,7 @@ again:
                         goto err;
                 }
                 wc.wc_flags = IB_WC_WITH_IMM;
-                wc.imm_data = wqe->wr.imm_data;
+                wc.imm_data = wqe->wr.ex.imm_data;
                 if (!ipath_get_rwqe(qp, 1))
                         goto rnr_nak;
                 /* FALLTHROUGH */
diff --git a/drivers/infiniband/hw/ipath/ipath_uc.c b/drivers/infiniband/hw/ipath/ipath_uc.c
index 2dd8de20d22..bfe8926b551 100644
--- a/drivers/infiniband/hw/ipath/ipath_uc.c
+++ b/drivers/infiniband/hw/ipath/ipath_uc.c
@@ -94,7 +94,7 @@ int ipath_make_uc_req(struct ipath_qp *qp)
                                 qp->s_state =
                                         OP(SEND_ONLY_WITH_IMMEDIATE);
                                 /* Immediate data comes after the BTH */
-                                ohdr->u.imm_data = wqe->wr.imm_data;
+                                ohdr->u.imm_data = wqe->wr.ex.imm_data;
                                 hwords += 1;
                         }
                         if (wqe->wr.send_flags & IB_SEND_SOLICITED)
@@ -123,7 +123,7 @@ int ipath_make_uc_req(struct ipath_qp *qp)
                                 qp->s_state =
                                         OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE);
                                 /* Immediate data comes after the RETH */
-                                ohdr->u.rc.imm_data = wqe->wr.imm_data;
+                                ohdr->u.rc.imm_data = wqe->wr.ex.imm_data;
                                 hwords += 1;
                                 if (wqe->wr.send_flags & IB_SEND_SOLICITED)
                                         bth0 |= 1 << 23;
@@ -152,7 +152,7 @@ int ipath_make_uc_req(struct ipath_qp *qp)
                 else {
                         qp->s_state = OP(SEND_LAST_WITH_IMMEDIATE);
                         /* Immediate data comes after the BTH */
-                        ohdr->u.imm_data = wqe->wr.imm_data;
+                        ohdr->u.imm_data = wqe->wr.ex.imm_data;
                         hwords += 1;
                 }
                 if (wqe->wr.send_flags & IB_SEND_SOLICITED)
@@ -177,7 +177,7 @@ int ipath_make_uc_req(struct ipath_qp *qp)
                         qp->s_state =
                                 OP(RDMA_WRITE_LAST_WITH_IMMEDIATE);
                         /* Immediate data comes after the BTH */
-                        ohdr->u.imm_data = wqe->wr.imm_data;
+                        ohdr->u.imm_data = wqe->wr.ex.imm_data;
                         hwords += 1;
                         if (wqe->wr.send_flags & IB_SEND_SOLICITED)
                                 bth0 |= 1 << 23;
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c
index 918f5207065..8b6a261c89e 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -95,7 +95,7 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe)
 
         if (swqe->wr.opcode == IB_WR_SEND_WITH_IMM) {
                 wc.wc_flags = IB_WC_WITH_IMM;
-                wc.imm_data = swqe->wr.imm_data;
+                wc.imm_data = swqe->wr.ex.imm_data;
         } else {
                 wc.wc_flags = 0;
                 wc.imm_data = 0;
@@ -327,7 +327,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
         }
         if (wqe->wr.opcode == IB_WR_SEND_WITH_IMM) {
                 qp->s_hdrwords++;
-                ohdr->u.ud.imm_data = wqe->wr.imm_data;
+                ohdr->u.ud.imm_data = wqe->wr.ex.imm_data;
                 bth0 = IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE << 24;
         } else
                 bth0 = IB_OPCODE_UD_SEND_ONLY << 24;