diff options
author | Israel Rukshin <israelr@mellanox.com> | 2019-06-11 11:52:50 -0400 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-06-24 10:49:27 -0400 |
commit | c0a6cbb9cbccffc249743afa16e64f16c46c80b2 (patch) | |
tree | 5d2cdcd5da9126d1e6053fd47ca1071eddcf3719 /drivers/infiniband/ulp | |
parent | 5a6781a558cc3909851c04a0d44e3a87a35aad94 (diff) |
RDMA/core: Rename signature qp create flag and signature device capability
Rename IB_QP_CREATE_SIGNATURE_EN to IB_QP_CREATE_INTEGRITY_EN
and IB_DEVICE_SIGNATURE_HANDOVER to IB_DEVICE_INTEGRITY_HANDOVER.
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/ulp')
-rw-r--r-- | drivers/infiniband/ulp/iser/iser_verbs.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/ulp/isert/ib_isert.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c index ea9cf04ad002..a6548de0e218 100644 --- a/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/drivers/infiniband/ulp/iser/iser_verbs.c | |||
@@ -399,7 +399,7 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn) | |||
399 | init_attr.qp_type = IB_QPT_RC; | 399 | init_attr.qp_type = IB_QPT_RC; |
400 | if (ib_conn->pi_support) { | 400 | if (ib_conn->pi_support) { |
401 | init_attr.cap.max_send_wr = ISER_QP_SIG_MAX_REQ_DTOS + 1; | 401 | init_attr.cap.max_send_wr = ISER_QP_SIG_MAX_REQ_DTOS + 1; |
402 | init_attr.create_flags |= IB_QP_CREATE_SIGNATURE_EN; | 402 | init_attr.create_flags |= IB_QP_CREATE_INTEGRITY_EN; |
403 | iser_conn->max_cmds = | 403 | iser_conn->max_cmds = |
404 | ISER_GET_MAX_XMIT_CMDS(ISER_QP_SIG_MAX_REQ_DTOS); | 404 | ISER_GET_MAX_XMIT_CMDS(ISER_QP_SIG_MAX_REQ_DTOS); |
405 | } else { | 405 | } else { |
@@ -712,7 +712,7 @@ static void iser_addr_handler(struct rdma_cm_id *cma_id) | |||
712 | /* connection T10-PI support */ | 712 | /* connection T10-PI support */ |
713 | if (iser_pi_enable) { | 713 | if (iser_pi_enable) { |
714 | if (!(device->ib_device->attrs.device_cap_flags & | 714 | if (!(device->ib_device->attrs.device_cap_flags & |
715 | IB_DEVICE_SIGNATURE_HANDOVER)) { | 715 | IB_DEVICE_INTEGRITY_HANDOVER)) { |
716 | iser_warn("T10-PI requested but not supported on %s, " | 716 | iser_warn("T10-PI requested but not supported on %s, " |
717 | "continue without T10-PI\n", | 717 | "continue without T10-PI\n", |
718 | dev_name(&ib_conn->device->ib_device->dev)); | 718 | dev_name(&ib_conn->device->ib_device->dev)); |
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c index ffef4ac152ca..53bc505f5292 100644 --- a/drivers/infiniband/ulp/isert/ib_isert.c +++ b/drivers/infiniband/ulp/isert/ib_isert.c | |||
@@ -141,7 +141,7 @@ isert_create_qp(struct isert_conn *isert_conn, | |||
141 | attr.sq_sig_type = IB_SIGNAL_REQ_WR; | 141 | attr.sq_sig_type = IB_SIGNAL_REQ_WR; |
142 | attr.qp_type = IB_QPT_RC; | 142 | attr.qp_type = IB_QPT_RC; |
143 | if (device->pi_capable) | 143 | if (device->pi_capable) |
144 | attr.create_flags |= IB_QP_CREATE_SIGNATURE_EN; | 144 | attr.create_flags |= IB_QP_CREATE_INTEGRITY_EN; |
145 | 145 | ||
146 | ret = rdma_create_qp(cma_id, device->pd, &attr); | 146 | ret = rdma_create_qp(cma_id, device->pd, &attr); |
147 | if (ret) { | 147 | if (ret) { |
@@ -317,7 +317,7 @@ isert_create_device_ib_res(struct isert_device *device) | |||
317 | 317 | ||
318 | /* Check signature cap */ | 318 | /* Check signature cap */ |
319 | device->pi_capable = ib_dev->attrs.device_cap_flags & | 319 | device->pi_capable = ib_dev->attrs.device_cap_flags & |
320 | IB_DEVICE_SIGNATURE_HANDOVER ? true : false; | 320 | IB_DEVICE_INTEGRITY_HANDOVER ? true : false; |
321 | 321 | ||
322 | return 0; | 322 | return 0; |
323 | 323 | ||