diff options
author | Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com> | 2017-04-29 14:41:19 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-05-01 14:32:43 -0400 |
commit | 0a18cfe4f6d7dba135a04dc18633006ba5b51646 (patch) | |
tree | 25019fb5e70c24ca6e46d123e4998eef5cecd192 | |
parent | 90898850ec4e7b3ba0f9a35cc7169ff19ff367a6 (diff) |
IB/core: Rename ib_create_ah to rdma_create_ah
Rename ib_create_ah to rdma_create_ah so its in sync with the
rename of the ib address handle attribute
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Don Hiatt <don.hiatt@intel.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r-- | drivers/infiniband/core/cm.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/core/sa_query.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/core/user_mad.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/core/verbs.c | 6 | ||||
-rw-r--r-- | drivers/infiniband/hw/hfi1/verbs.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/mlx4/mad.c | 8 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_mad.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/qib/qib_verbs.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 2 | ||||
-rw-r--r-- | include/rdma/ib_verbs.h | 4 |
11 files changed, 18 insertions, 18 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index c9751ccd9bf4..ac62dd898a5e 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c | |||
@@ -343,7 +343,7 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv, | |||
343 | ret = -ENODEV; | 343 | ret = -ENODEV; |
344 | goto out; | 344 | goto out; |
345 | } | 345 | } |
346 | ah = ib_create_ah(mad_agent->qp->pd, &av->ah_attr); | 346 | ah = rdma_create_ah(mad_agent->qp->pd, &av->ah_attr); |
347 | if (IS_ERR(ah)) { | 347 | if (IS_ERR(ah)) { |
348 | ret = PTR_ERR(ah); | 348 | ret = PTR_ERR(ah); |
349 | goto out; | 349 | goto out; |
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c index 18e08533a845..e998d6baaeff 100644 --- a/drivers/infiniband/core/sa_query.c +++ b/drivers/infiniband/core/sa_query.c | |||
@@ -2043,7 +2043,7 @@ static void update_sm_ah(struct work_struct *work) | |||
2043 | cpu_to_be64(IB_SA_WELL_KNOWN_GUID); | 2043 | cpu_to_be64(IB_SA_WELL_KNOWN_GUID); |
2044 | } | 2044 | } |
2045 | 2045 | ||
2046 | new_ah->ah = ib_create_ah(port->agent->qp->pd, &ah_attr); | 2046 | new_ah->ah = rdma_create_ah(port->agent->qp->pd, &ah_attr); |
2047 | if (IS_ERR(new_ah->ah)) { | 2047 | if (IS_ERR(new_ah->ah)) { |
2048 | pr_warn("Couldn't create new SM AH\n"); | 2048 | pr_warn("Couldn't create new SM AH\n"); |
2049 | kfree(new_ah); | 2049 | kfree(new_ah); |
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 7198c4009988..3ac6f9740a0e 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c | |||
@@ -502,7 +502,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, | |||
502 | ah_attr.grh.traffic_class = packet->mad.hdr.traffic_class; | 502 | ah_attr.grh.traffic_class = packet->mad.hdr.traffic_class; |
503 | } | 503 | } |
504 | 504 | ||
505 | ah = ib_create_ah(agent->qp->pd, &ah_attr); | 505 | ah = rdma_create_ah(agent->qp->pd, &ah_attr); |
506 | if (IS_ERR(ah)) { | 506 | if (IS_ERR(ah)) { |
507 | ret = PTR_ERR(ah); | 507 | ret = PTR_ERR(ah); |
508 | goto err_up; | 508 | goto err_up; |
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index b1cde147758a..b52f4a1495ad 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c | |||
@@ -311,7 +311,7 @@ EXPORT_SYMBOL(ib_dealloc_pd); | |||
311 | 311 | ||
312 | /* Address handles */ | 312 | /* Address handles */ |
313 | 313 | ||
314 | struct ib_ah *ib_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr) | 314 | struct ib_ah *rdma_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr) |
315 | { | 315 | { |
316 | struct ib_ah *ah; | 316 | struct ib_ah *ah; |
317 | 317 | ||
@@ -326,7 +326,7 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr) | |||
326 | 326 | ||
327 | return ah; | 327 | return ah; |
328 | } | 328 | } |
329 | EXPORT_SYMBOL(ib_create_ah); | 329 | EXPORT_SYMBOL(rdma_create_ah); |
330 | 330 | ||
331 | int ib_get_rdma_header_version(const union rdma_network_hdr *hdr) | 331 | int ib_get_rdma_header_version(const union rdma_network_hdr *hdr) |
332 | { | 332 | { |
@@ -567,7 +567,7 @@ struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, const struct ib_wc *wc, | |||
567 | if (ret) | 567 | if (ret) |
568 | return ERR_PTR(ret); | 568 | return ERR_PTR(ret); |
569 | 569 | ||
570 | return ib_create_ah(pd, &ah_attr); | 570 | return rdma_create_ah(pd, &ah_attr); |
571 | } | 571 | } |
572 | EXPORT_SYMBOL(ib_create_ah_from_wc); | 572 | EXPORT_SYMBOL(ib_create_ah_from_wc); |
573 | 573 | ||
diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c index 0d3ae04d27a0..3cd11222456a 100644 --- a/drivers/infiniband/hw/hfi1/verbs.c +++ b/drivers/infiniband/hw/hfi1/verbs.c | |||
@@ -1518,7 +1518,7 @@ struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid) | |||
1518 | rcu_read_lock(); | 1518 | rcu_read_lock(); |
1519 | qp0 = rcu_dereference(ibp->rvp.qp[0]); | 1519 | qp0 = rcu_dereference(ibp->rvp.qp[0]); |
1520 | if (qp0) | 1520 | if (qp0) |
1521 | ah = ib_create_ah(qp0->ibqp.pd, &attr); | 1521 | ah = rdma_create_ah(qp0->ibqp.pd, &attr); |
1522 | rcu_read_unlock(); | 1522 | rcu_read_unlock(); |
1523 | return ah; | 1523 | return ah; |
1524 | } | 1524 | } |
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index d934959eb9b5..76010d02e2ab 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c | |||
@@ -200,8 +200,8 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl) | |||
200 | ah_attr.sl = sl; | 200 | ah_attr.sl = sl; |
201 | ah_attr.port_num = port_num; | 201 | ah_attr.port_num = port_num; |
202 | 202 | ||
203 | new_ah = ib_create_ah(dev->send_agent[port_num - 1][0]->qp->pd, | 203 | new_ah = rdma_create_ah(dev->send_agent[port_num - 1][0]->qp->pd, |
204 | &ah_attr); | 204 | &ah_attr); |
205 | if (IS_ERR(new_ah)) | 205 | if (IS_ERR(new_ah)) |
206 | return; | 206 | return; |
207 | 207 | ||
@@ -563,7 +563,7 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port, | |||
563 | return -EINVAL; | 563 | return -EINVAL; |
564 | attr.ah_flags = IB_AH_GRH; | 564 | attr.ah_flags = IB_AH_GRH; |
565 | } | 565 | } |
566 | ah = ib_create_ah(tun_ctx->pd, &attr); | 566 | ah = rdma_create_ah(tun_ctx->pd, &attr); |
567 | if (IS_ERR(ah)) | 567 | if (IS_ERR(ah)) |
568 | return -ENOMEM; | 568 | return -ENOMEM; |
569 | 569 | ||
@@ -1391,7 +1391,7 @@ int mlx4_ib_send_to_wire(struct mlx4_ib_dev *dev, int slave, u8 port, | |||
1391 | /* create ah */ | 1391 | /* create ah */ |
1392 | sgid_index = attr->grh.sgid_index; | 1392 | sgid_index = attr->grh.sgid_index; |
1393 | attr->grh.sgid_index = 0; | 1393 | attr->grh.sgid_index = 0; |
1394 | ah = ib_create_ah(sqp_ctx->pd, attr); | 1394 | ah = rdma_create_ah(sqp_ctx->pd, attr); |
1395 | if (IS_ERR(ah)) | 1395 | if (IS_ERR(ah)) |
1396 | return -ENOMEM; | 1396 | return -ENOMEM; |
1397 | attr->grh.sgid_index = sgid_index; | 1397 | attr->grh.sgid_index = sgid_index; |
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c index 00f783139299..7f671a20649c 100644 --- a/drivers/infiniband/hw/mthca/mthca_mad.c +++ b/drivers/infiniband/hw/mthca/mthca_mad.c | |||
@@ -86,8 +86,8 @@ static void update_sm_ah(struct mthca_dev *dev, | |||
86 | ah_attr.sl = sl; | 86 | ah_attr.sl = sl; |
87 | ah_attr.port_num = port_num; | 87 | ah_attr.port_num = port_num; |
88 | 88 | ||
89 | new_ah = ib_create_ah(dev->send_agent[port_num - 1][0]->qp->pd, | 89 | new_ah = rdma_create_ah(dev->send_agent[port_num - 1][0]->qp->pd, |
90 | &ah_attr); | 90 | &ah_attr); |
91 | if (IS_ERR(new_ah)) | 91 | if (IS_ERR(new_ah)) |
92 | return; | 92 | return; |
93 | 93 | ||
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c index 16a9aa1407bd..de04acab0768 100644 --- a/drivers/infiniband/hw/qib/qib_verbs.c +++ b/drivers/infiniband/hw/qib/qib_verbs.c | |||
@@ -1374,7 +1374,7 @@ struct ib_ah *qib_create_qp0_ah(struct qib_ibport *ibp, u16 dlid) | |||
1374 | rcu_read_lock(); | 1374 | rcu_read_lock(); |
1375 | qp0 = rcu_dereference(ibp->rvp.qp[0]); | 1375 | qp0 = rcu_dereference(ibp->rvp.qp[0]); |
1376 | if (qp0) | 1376 | if (qp0) |
1377 | ah = ib_create_ah(qp0->ibqp.pd, &attr); | 1377 | ah = rdma_create_ah(qp0->ibqp.pd, &attr); |
1378 | rcu_read_unlock(); | 1378 | rcu_read_unlock(); |
1379 | return ah; | 1379 | return ah; |
1380 | } | 1380 | } |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index adbce02b333e..e0ba6b08aa96 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c | |||
@@ -65,7 +65,7 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev, | |||
65 | ah->last_send = 0; | 65 | ah->last_send = 0; |
66 | kref_init(&ah->ref); | 66 | kref_init(&ah->ref); |
67 | 67 | ||
68 | vah = ib_create_ah(pd, attr); | 68 | vah = rdma_create_ah(pd, attr); |
69 | if (IS_ERR(vah)) { | 69 | if (IS_ERR(vah)) { |
70 | kfree(ah); | 70 | kfree(ah); |
71 | ah = (struct ipoib_ah *)vah; | 71 | ah = (struct ipoib_ah *)vah; |
diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c index 4f0b74bf6dc8..f6c11f615df9 100644 --- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | |||
@@ -772,7 +772,7 @@ void opa_vnic_vema_send_trap(struct opa_vnic_adapter *adapter, | |||
772 | } | 772 | } |
773 | 773 | ||
774 | ah_attr.dlid = trap_lid; | 774 | ah_attr.dlid = trap_lid; |
775 | ah = ib_create_ah(port->mad_agent->qp->pd, &ah_attr); | 775 | ah = rdma_create_ah(port->mad_agent->qp->pd, &ah_attr); |
776 | if (IS_ERR(ah)) { | 776 | if (IS_ERR(ah)) { |
777 | c_err("%s:Couldn't create new AH = %p\n", __func__, ah); | 777 | c_err("%s:Couldn't create new AH = %p\n", __func__, ah); |
778 | c_err("%s:dlid = %d, sl = %d, port = %d\n", __func__, | 778 | c_err("%s:dlid = %d, sl = %d, port = %d\n", __func__, |
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index ed9f19817db8..d65812147602 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h | |||
@@ -2720,14 +2720,14 @@ struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags, | |||
2720 | void ib_dealloc_pd(struct ib_pd *pd); | 2720 | void ib_dealloc_pd(struct ib_pd *pd); |
2721 | 2721 | ||
2722 | /** | 2722 | /** |
2723 | * ib_create_ah - Creates an address handle for the given address vector. | 2723 | * rdma_create_ah - Creates an address handle for the given address vector. |
2724 | * @pd: The protection domain associated with the address handle. | 2724 | * @pd: The protection domain associated with the address handle. |
2725 | * @ah_attr: The attributes of the address vector. | 2725 | * @ah_attr: The attributes of the address vector. |
2726 | * | 2726 | * |
2727 | * The address handle is used to reference a local or global destination | 2727 | * The address handle is used to reference a local or global destination |
2728 | * in all UD QP post sends. | 2728 | * in all UD QP post sends. |
2729 | */ | 2729 | */ |
2730 | struct ib_ah *ib_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr); | 2730 | struct ib_ah *rdma_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr); |
2731 | 2731 | ||
2732 | /** | 2732 | /** |
2733 | * ib_get_gids_from_rdma_hdr - Get sgid and dgid from GRH or IPv4 header | 2733 | * ib_get_gids_from_rdma_hdr - Get sgid and dgid from GRH or IPv4 header |