Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

Pull rdma updates from Doug Ledford:
 "This is my initial round of 4.4 merge window patches.  There are a few
  other things I wish to get in for 4.4 that aren't in this pull, as
  this represents what has gone through merge/build/run testing and not
  what is the last few items for which testing is not yet complete.

   - "Checksum offload support in user space" enablement
   - Misc cxgb4 fixes, add T6 support
   - Misc usnic fixes
   - 32 bit build warning fixes
   - Misc ocrdma fixes
   - Multicast loopback prevention extension
   - Extend the GID cache to store and return attributes of GIDs
   - Misc iSER updates
   - iSER clustering update
   - Network NameSpace support for rdma CM
   - Work Request cleanup series
   - New Memory Registration API"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (76 commits)
  IB/core, cma: Make __attribute_const__ declarations sparse-friendly
  IB/core: Remove old fast registration API
  IB/ipath: Remove fast registration from the code
  IB/hfi1: Remove fast registration from the code
  RDMA/nes: Remove old FRWR API
  IB/qib: Remove old FRWR API
  iw_cxgb4: Remove old FRWR API
  RDMA/cxgb3: Remove old FRWR API
  RDMA/ocrdma: Remove old FRWR API
  IB/mlx4: Remove old FRWR API support
  IB/mlx5: Remove old FRWR API support
  IB/srp: Dont allocate a page vector when using fast_reg
  IB/srp: Remove srp_finish_mapping
  IB/srp: Convert to new registration API
  IB/srp: Split srp_map_sg
  RDS/IW: Convert to new memory registration API
  svcrdma: Port to new memory registration API
  xprtrdma: Port to new memory registration API
  iser-target: Port to new memory registration API
  IB/iser: Port to new fast registration API
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/infiniband/hw/qib/qib_ruc.c b/drivers/infiniband/hw/qib/qib_ruc.c
index 22e356ca8058..b1aa21bdd484 100644
--- a/drivers/infiniband/hw/qib/qib_ruc.c
+++ b/drivers/infiniband/hw/qib/qib_ruc.c
@@ -459,8 +459,8 @@ again:
                 if (wqe->length == 0)
                         break;
                 if (unlikely(!qib_rkey_ok(qp, &qp->r_sge.sge, wqe->length,
-                                          wqe->wr.wr.rdma.remote_addr,
-                                          wqe->wr.wr.rdma.rkey,
+                                          wqe->rdma_wr.remote_addr,
+                                          wqe->rdma_wr.rkey,
                                           IB_ACCESS_REMOTE_WRITE)))
                         goto acc_err;
                 qp->r_sge.sg_list = NULL;
@@ -472,8 +472,8 @@ again:
                 if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_READ)))
                         goto inv_err;
                 if (unlikely(!qib_rkey_ok(qp, &sqp->s_sge.sge, wqe->length,
-                                          wqe->wr.wr.rdma.remote_addr,
-                                          wqe->wr.wr.rdma.rkey,
+                                          wqe->rdma_wr.remote_addr,
+                                          wqe->rdma_wr.rkey,
                                           IB_ACCESS_REMOTE_READ)))
                         goto acc_err;
                 release = 0;
@@ -490,18 +490,18 @@ again:
                 if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_ATOMIC)))
                         goto inv_err;
                 if (unlikely(!qib_rkey_ok(qp, &qp->r_sge.sge, sizeof(u64),
-                                          wqe->wr.wr.atomic.remote_addr,
-                                          wqe->wr.wr.atomic.rkey,
+                                          wqe->atomic_wr.remote_addr,
+                                          wqe->atomic_wr.rkey,
                                           IB_ACCESS_REMOTE_ATOMIC)))
                         goto acc_err;
                 /* Perform atomic OP and save result. */
                 maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
-                sdata = wqe->wr.wr.atomic.compare_add;
+                sdata = wqe->atomic_wr.compare_add;
                 *(u64 *) sqp->s_sge.sge.vaddr =
-                        (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
+                        (wqe->atomic_wr.wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
                         (u64) atomic64_add_return(sdata, maddr) - sdata :
                         (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
-                                      sdata, wqe->wr.wr.atomic.swap);
+                                      sdata, wqe->atomic_wr.swap);
                 qib_put_mr(qp->r_sge.sge.mr);
                 qp->r_sge.num_sge = 0;
                 goto send_comp;
@@ -785,7 +785,7 @@ void qib_send_complete(struct qib_qp *qp, struct qib_swqe *wqe,
         if (qp->ibqp.qp_type == IB_QPT_UD ||
             qp->ibqp.qp_type == IB_QPT_SMI ||
             qp->ibqp.qp_type == IB_QPT_GSI)
-                atomic_dec(&to_iah(wqe->wr.wr.ud.ah)->refcount);
+                atomic_dec(&to_iah(wqe->ud_wr.ah)->refcount);
 
         /* See ch. 11.2.4.1 and 10.7.3.1 */
         if (!(qp->s_flags & QIB_S_SIGNAL_REQ_WR) ||