Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (62 commits)
  mlx4_core: Deprecate log_num_vlan module param
  IB/mlx4: Don't set VLAN in IBoE WQEs' control segment
  IB/mlx4: Enable 4K mtu for IBoE
  RDMA/cxgb4: Mark QP in error before disabling the queue in firmware
  RDMA/cxgb4: Serialize calls to CQ's comp_handler
  RDMA/cxgb3: Serialize calls to CQ's comp_handler
  IB/qib: Fix issue with link states and QSFP cables
  IB/mlx4: Configure extended active speeds
  mlx4_core: Add extended port capabilities support
  IB/qib: Hold links until tuning data is available
  IB/qib: Clean up checkpatch issue
  IB/qib: Remove s_lock around header validation
  IB/qib: Precompute timeout jiffies to optimize latency
  IB/qib: Use RCU for qpn lookup
  IB/qib: Eliminate divide/mod in converting idx to egr buf pointer
  IB/qib: Decode path MTU optimization
  IB/qib: Optimize RC/UC code by IB operation
  IPoIB: Use the right function to do DMA unmap pages
  RDMA/cxgb4: Use correct QID in insert_recv_cqe()
  RDMA/cxgb4: Make sure flush CQ entries are collected on connection close
  ...

84 files changed, 4738 insertions, 984 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index fc0f2bd9ca82..4104ea2427c2 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -889,6 +889,8 @@ retest:
                 break;
         case IB_CM_ESTABLISHED:
                 spin_unlock_irq(&cm_id_priv->lock);
+                if (cm_id_priv->qp_type == IB_QPT_XRC_TGT)
+                        break;
                 ib_send_cm_dreq(cm_id, NULL, 0);
                 goto retest;
         case IB_CM_DREQ_SENT:
@@ -1008,7 +1010,6 @@ static void cm_format_req(struct cm_req_msg *req_msg,
         req_msg->service_id = param->service_id;
         req_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
         cm_req_set_local_qpn(req_msg, cpu_to_be32(param->qp_num));
-        cm_req_set_resp_res(req_msg, param->responder_resources);
         cm_req_set_init_depth(req_msg, param->initiator_depth);
         cm_req_set_remote_resp_timeout(req_msg,
                                        param->remote_cm_response_timeout);
@@ -1017,12 +1018,16 @@ static void cm_format_req(struct cm_req_msg *req_msg,
         cm_req_set_starting_psn(req_msg, cpu_to_be32(param->starting_psn));
         cm_req_set_local_resp_timeout(req_msg,
                                       param->local_cm_response_timeout);
-        cm_req_set_retry_count(req_msg, param->retry_count);
         req_msg->pkey = param->primary_path->pkey;
         cm_req_set_path_mtu(req_msg, param->primary_path->mtu);
-        cm_req_set_rnr_retry_count(req_msg, param->rnr_retry_count);
         cm_req_set_max_cm_retries(req_msg, param->max_cm_retries);
-        cm_req_set_srq(req_msg, param->srq);
+
+        if (param->qp_type != IB_QPT_XRC_INI) {
+                cm_req_set_resp_res(req_msg, param->responder_resources);
+                cm_req_set_retry_count(req_msg, param->retry_count);
+                cm_req_set_rnr_retry_count(req_msg, param->rnr_retry_count);
+                cm_req_set_srq(req_msg, param->srq);
+        }
 
         if (pri_path->hop_limit <= 1) {
                 req_msg->primary_local_lid = pri_path->slid;