2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 50e1f2a16e0c..ca7265443c05 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -1109,8 +1109,7 @@ int iwch_register_device(struct iwch_dev *dev)
         memcpy(&dev->ibdev.node_guid, dev->rdev.t3cdev_p->lldev->dev_addr, 6);
         dev->ibdev.owner = THIS_MODULE;
         dev->device_cap_flags =
-            (IB_DEVICE_ZERO_STAG |
-             IB_DEVICE_SEND_W_INV | IB_DEVICE_MEM_WINDOW);
+            (IB_DEVICE_ZERO_STAG | IB_DEVICE_MEM_WINDOW);
 
         dev->ibdev.uverbs_cmd_mask =
             (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index bc5d9b0813e5..8891c3b0a3d5 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -72,7 +72,7 @@ static int iwch_build_rdma_send(union t3_wr *wqe, struct ib_send_wr *wr,
         wqe->send.reserved[2] = 0;
         if (wr->opcode == IB_WR_SEND_WITH_IMM) {
                 plen = 4;
-                wqe->send.sgl[0].stag = wr->imm_data;
+                wqe->send.sgl[0].stag = wr->ex.imm_data;
                 wqe->send.sgl[0].len = __constant_cpu_to_be32(0);
                 wqe->send.num_sgle = __constant_cpu_to_be32(0);
                 *flit_cnt = 5;
@@ -112,7 +112,7 @@ static int iwch_build_rdma_write(union t3_wr *wqe, struct ib_send_wr *wr,
 
         if (wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) {
                 plen = 4;
-                wqe->write.sgl[0].stag = wr->imm_data;
+                wqe->write.sgl[0].stag = wr->ex.imm_data;
                 wqe->write.sgl[0].len = __constant_cpu_to_be32(0);
                 wqe->write.num_sgle = __constant_cpu_to_be32(0);
                 *flit_cnt = 6;