2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/qib/qib_rc.c b/drivers/infiniband/hw/qib/qib_rc.c
index a0931119bd78..955fb7157793 100644
--- a/drivers/infiniband/hw/qib/qib_rc.c
+++ b/drivers/infiniband/hw/qib/qib_rc.c
@@ -2068,7 +2068,10 @@ send_last:
                         goto nack_op_err;
                 if (!ret)
                         goto rnr_nak;
-                goto send_last_imm;
+                wc.ex.imm_data = ohdr->u.rc.imm_data;
+                hdrsize += 4;
+                wc.wc_flags = IB_WC_WITH_IMM;
+                goto send_last;
 
         case OP(RDMA_READ_REQUEST): {
                 struct qib_ack_entry *e;
diff --git a/drivers/infiniband/hw/qib/qib_uc.c b/drivers/infiniband/hw/qib/qib_uc.c
index b9c8b6346c1b..32ccf3c824ca 100644
--- a/drivers/infiniband/hw/qib/qib_uc.c
+++ b/drivers/infiniband/hw/qib/qib_uc.c
@@ -457,8 +457,10 @@ rdma_first:
                 }
                 if (opcode == OP(RDMA_WRITE_ONLY))
                         goto rdma_last;
-                else if (opcode == OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE))
+                else if (opcode == OP(RDMA_WRITE_ONLY_WITH_IMMEDIATE)) {
+                        wc.ex.imm_data = ohdr->u.rc.imm_data;
                         goto rdma_last_imm;
+                }
                 /* FALLTHROUGH */
         case OP(RDMA_WRITE_MIDDLE):
                 /* Check for invalid length PMTU or posted rwqe len. */
@@ -471,8 +473,8 @@ rdma_first:
                 break;
 
         case OP(RDMA_WRITE_LAST_WITH_IMMEDIATE):
-rdma_last_imm:
                 wc.ex.imm_data = ohdr->u.imm_data;
+rdma_last_imm:
                 hdrsize += 4;
                 wc.wc_flags = IB_WC_WITH_IMM;