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_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
index 26243b722b5e..59193f67ea78 100644
--- a/drivers/infiniband/hw/qib/qib_ud.c
+++ b/drivers/infiniband/hw/qib/qib_ud.c
@@ -59,7 +59,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
         u32 length;
         enum ib_qp_type sqptype, dqptype;
 
-        qp = qib_lookup_qpn(ibp, swqe->wr.wr.ud.remote_qpn);
+        qp = qib_lookup_qpn(ibp, swqe->ud_wr.remote_qpn);
         if (!qp) {
                 ibp->n_pkt_drops++;
                 return;
@@ -76,7 +76,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
                 goto drop;
         }
 
-        ah_attr = &to_iah(swqe->wr.wr.ud.ah)->attr;
+        ah_attr = &to_iah(swqe->ud_wr.ah)->attr;
         ppd = ppd_from_ibp(ibp);
 
         if (qp->ibqp.qp_num > 1) {
@@ -106,8 +106,8 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
         if (qp->ibqp.qp_num) {
                 u32 qkey;
 
-                qkey = (int)swqe->wr.wr.ud.remote_qkey < 0 ?
-                        sqp->qkey : swqe->wr.wr.ud.remote_qkey;
+                qkey = (int)swqe->ud_wr.remote_qkey < 0 ?
+                        sqp->qkey : swqe->ud_wr.remote_qkey;
                 if (unlikely(qkey != qp->qkey)) {
                         u16 lid;
 
@@ -210,7 +210,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
         wc.qp = &qp->ibqp;
         wc.src_qp = sqp->ibqp.qp_num;
         wc.pkey_index = qp->ibqp.qp_type == IB_QPT_GSI ?
-                swqe->wr.wr.ud.pkey_index : 0;
+                swqe->ud_wr.pkey_index : 0;
         wc.slid = ppd->lid | (ah_attr->src_path_bits & ((1 << ppd->lmc) - 1));
         wc.sl = ah_attr->sl;
         wc.dlid_path_bits = ah_attr->dlid & ((1 << ppd->lmc) - 1);
@@ -277,7 +277,7 @@ int qib_make_ud_req(struct qib_qp *qp)
         /* Construct the header. */
         ibp = to_iport(qp->ibqp.device, qp->port_num);
         ppd = ppd_from_ibp(ibp);
-        ah_attr = &to_iah(wqe->wr.wr.ud.ah)->attr;
+        ah_attr = &to_iah(wqe->ud_wr.ah)->attr;
         if (ah_attr->dlid >= QIB_MULTICAST_LID_BASE) {
                 if (ah_attr->dlid != QIB_PERMISSIVE_LID)
                         this_cpu_inc(ibp->pmastats->n_multicast_xmit);
@@ -363,7 +363,7 @@ int qib_make_ud_req(struct qib_qp *qp)
         bth0 |= extra_bytes << 20;
         bth0 |= qp->ibqp.qp_type == IB_QPT_SMI ? QIB_DEFAULT_P_KEY :
                 qib_get_pkey(ibp, qp->ibqp.qp_type == IB_QPT_GSI ?
-                             wqe->wr.wr.ud.pkey_index : qp->s_pkey_index);
+                             wqe->ud_wr.pkey_index : qp->s_pkey_index);
         ohdr->bth[0] = cpu_to_be32(bth0);
         /*
          * Use the multicast QP if the destination LID is a multicast LID.
@@ -371,14 +371,14 @@ int qib_make_ud_req(struct qib_qp *qp)
         ohdr->bth[1] = ah_attr->dlid >= QIB_MULTICAST_LID_BASE &&
                 ah_attr->dlid != QIB_PERMISSIVE_LID ?
                 cpu_to_be32(QIB_MULTICAST_QPN) :
-                cpu_to_be32(wqe->wr.wr.ud.remote_qpn);
+                cpu_to_be32(wqe->ud_wr.remote_qpn);
         ohdr->bth[2] = cpu_to_be32(qp->s_next_psn++ & QIB_PSN_MASK);
         /*
          * Qkeys with the high order bit set mean use the
          * qkey from the QP context instead of the WR (see 10.2.5).
          */
-        ohdr->u.ud.deth[0] = cpu_to_be32((int)wqe->wr.wr.ud.remote_qkey < 0 ?
-                                         qp->qkey : wqe->wr.wr.ud.remote_qkey);
+        ohdr->u.ud.deth[0] = cpu_to_be32((int)wqe->ud_wr.remote_qkey < 0 ?
+                                         qp->qkey : wqe->ud_wr.remote_qkey);
         ohdr->u.ud.deth[1] = cpu_to_be32(qp->ibqp.qp_num);
 
 done: