aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/core/cma.c6
-rw-r--r--include/rdma/rdma_cm.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 985a6b564d8f..914a5a4c7f1e 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -133,7 +133,6 @@ struct rdma_id_private {
133 133
134 u32 seq_num; 134 u32 seq_num;
135 u32 qp_num; 135 u32 qp_num;
136 enum ib_qp_type qp_type;
137 u8 srq; 136 u8 srq;
138}; 137};
139 138
@@ -392,7 +391,6 @@ int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd,
392 391
393 id->qp = qp; 392 id->qp = qp;
394 id_priv->qp_num = qp->qp_num; 393 id_priv->qp_num = qp->qp_num;
395 id_priv->qp_type = qp->qp_type;
396 id_priv->srq = (qp->srq != NULL); 394 id_priv->srq = (qp->srq != NULL);
397 return 0; 395 return 0;
398err: 396err:
@@ -1860,7 +1858,7 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
1860 req.service_id = cma_get_service_id(id_priv->id.ps, 1858 req.service_id = cma_get_service_id(id_priv->id.ps,
1861 &route->addr.dst_addr); 1859 &route->addr.dst_addr);
1862 req.qp_num = id_priv->qp_num; 1860 req.qp_num = id_priv->qp_num;
1863 req.qp_type = id_priv->qp_type; 1861 req.qp_type = IB_QPT_RC;
1864 req.starting_psn = id_priv->seq_num; 1862 req.starting_psn = id_priv->seq_num;
1865 req.responder_resources = conn_param->responder_resources; 1863 req.responder_resources = conn_param->responder_resources;
1866 req.initiator_depth = conn_param->initiator_depth; 1864 req.initiator_depth = conn_param->initiator_depth;
@@ -1937,7 +1935,6 @@ int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
1937 1935
1938 if (!id->qp) { 1936 if (!id->qp) {
1939 id_priv->qp_num = conn_param->qp_num; 1937 id_priv->qp_num = conn_param->qp_num;
1940 id_priv->qp_type = conn_param->qp_type;
1941 id_priv->srq = conn_param->srq; 1938 id_priv->srq = conn_param->srq;
1942 } 1939 }
1943 1940
@@ -2021,7 +2018,6 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
2021 2018
2022 if (!id->qp && conn_param) { 2019 if (!id->qp && conn_param) {
2023 id_priv->qp_num = conn_param->qp_num; 2020 id_priv->qp_num = conn_param->qp_num;
2024 id_priv->qp_type = conn_param->qp_type;
2025 id_priv->srq = conn_param->srq; 2021 id_priv->srq = conn_param->srq;
2026 } 2022 }
2027 2023
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index deb5a0a4cee5..4c07f9699d06 100644
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -215,7 +215,6 @@ struct rdma_conn_param {
215 /* Fields below ignored if a QP is created on the rdma_cm_id. */ 215 /* Fields below ignored if a QP is created on the rdma_cm_id. */
216 u8 srq; 216 u8 srq;
217 u32 qp_num; 217 u32 qp_num;
218 enum ib_qp_type qp_type;
219}; 218};
220 219
221/** 220/**