Skip to content

Commit 0a18cfe

Browse files
Dasaratharaman Chandramoulidledford
authored andcommitted
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 <[email protected]> Reviewed-by: Don Hiatt <[email protected]> Reviewed-by: Sean Hefty <[email protected]> Reviewed-by: Niranjana Vishwanathapura <[email protected]> Signed-off-by: Dasaratharaman Chandramouli <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent 9089885 commit 0a18cfe

File tree

11 files changed

+18
-18
lines changed

11 files changed

+18
-18
lines changed

drivers/infiniband/core/cm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv,
343343
ret = -ENODEV;
344344
goto out;
345345
}
346-
ah = ib_create_ah(mad_agent->qp->pd, &av->ah_attr);
346+
ah = rdma_create_ah(mad_agent->qp->pd, &av->ah_attr);
347347
if (IS_ERR(ah)) {
348348
ret = PTR_ERR(ah);
349349
goto out;

drivers/infiniband/core/sa_query.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@ static void update_sm_ah(struct work_struct *work)
20432043
cpu_to_be64(IB_SA_WELL_KNOWN_GUID);
20442044
}
20452045

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);
20472047
if (IS_ERR(new_ah->ah)) {
20482048
pr_warn("Couldn't create new SM AH\n");
20492049
kfree(new_ah);

drivers/infiniband/core/user_mad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
502502
ah_attr.grh.traffic_class = packet->mad.hdr.traffic_class;
503503
}
504504

505-
ah = ib_create_ah(agent->qp->pd, &ah_attr);
505+
ah = rdma_create_ah(agent->qp->pd, &ah_attr);
506506
if (IS_ERR(ah)) {
507507
ret = PTR_ERR(ah);
508508
goto err_up;

drivers/infiniband/core/verbs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ EXPORT_SYMBOL(ib_dealloc_pd);
311311

312312
/* Address handles */
313313

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)
315315
{
316316
struct ib_ah *ah;
317317

@@ -326,7 +326,7 @@ struct ib_ah *ib_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr)
326326

327327
return ah;
328328
}
329-
EXPORT_SYMBOL(ib_create_ah);
329+
EXPORT_SYMBOL(rdma_create_ah);
330330

331331
int ib_get_rdma_header_version(const union rdma_network_hdr *hdr)
332332
{
@@ -567,7 +567,7 @@ struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, const struct ib_wc *wc,
567567
if (ret)
568568
return ERR_PTR(ret);
569569

570-
return ib_create_ah(pd, &ah_attr);
570+
return rdma_create_ah(pd, &ah_attr);
571571
}
572572
EXPORT_SYMBOL(ib_create_ah_from_wc);
573573

drivers/infiniband/hw/hfi1/verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1518,7 +1518,7 @@ struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid)
15181518
rcu_read_lock();
15191519
qp0 = rcu_dereference(ibp->rvp.qp[0]);
15201520
if (qp0)
1521-
ah = ib_create_ah(qp0->ibqp.pd, &attr);
1521+
ah = rdma_create_ah(qp0->ibqp.pd, &attr);
15221522
rcu_read_unlock();
15231523
return ah;
15241524
}

drivers/infiniband/hw/mlx4/mad.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)
200200
ah_attr.sl = sl;
201201
ah_attr.port_num = port_num;
202202

203-
new_ah = ib_create_ah(dev->send_agent[port_num - 1][0]->qp->pd,
204-
&ah_attr);
203+
new_ah = rdma_create_ah(dev->send_agent[port_num - 1][0]->qp->pd,
204+
&ah_attr);
205205
if (IS_ERR(new_ah))
206206
return;
207207

@@ -563,7 +563,7 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
563563
return -EINVAL;
564564
attr.ah_flags = IB_AH_GRH;
565565
}
566-
ah = ib_create_ah(tun_ctx->pd, &attr);
566+
ah = rdma_create_ah(tun_ctx->pd, &attr);
567567
if (IS_ERR(ah))
568568
return -ENOMEM;
569569

@@ -1391,7 +1391,7 @@ int mlx4_ib_send_to_wire(struct mlx4_ib_dev *dev, int slave, u8 port,
13911391
/* create ah */
13921392
sgid_index = attr->grh.sgid_index;
13931393
attr->grh.sgid_index = 0;
1394-
ah = ib_create_ah(sqp_ctx->pd, attr);
1394+
ah = rdma_create_ah(sqp_ctx->pd, attr);
13951395
if (IS_ERR(ah))
13961396
return -ENOMEM;
13971397
attr->grh.sgid_index = sgid_index;

drivers/infiniband/hw/mthca/mthca_mad.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ static void update_sm_ah(struct mthca_dev *dev,
8686
ah_attr.sl = sl;
8787
ah_attr.port_num = port_num;
8888

89-
new_ah = ib_create_ah(dev->send_agent[port_num - 1][0]->qp->pd,
90-
&ah_attr);
89+
new_ah = rdma_create_ah(dev->send_agent[port_num - 1][0]->qp->pd,
90+
&ah_attr);
9191
if (IS_ERR(new_ah))
9292
return;
9393

drivers/infiniband/hw/qib/qib_verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ struct ib_ah *qib_create_qp0_ah(struct qib_ibport *ibp, u16 dlid)
13741374
rcu_read_lock();
13751375
qp0 = rcu_dereference(ibp->rvp.qp[0]);
13761376
if (qp0)
1377-
ah = ib_create_ah(qp0->ibqp.pd, &attr);
1377+
ah = rdma_create_ah(qp0->ibqp.pd, &attr);
13781378
rcu_read_unlock();
13791379
return ah;
13801380
}

drivers/infiniband/ulp/ipoib/ipoib_ib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev,
6565
ah->last_send = 0;
6666
kref_init(&ah->ref);
6767

68-
vah = ib_create_ah(pd, attr);
68+
vah = rdma_create_ah(pd, attr);
6969
if (IS_ERR(vah)) {
7070
kfree(ah);
7171
ah = (struct ipoib_ah *)vah;

drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ void opa_vnic_vema_send_trap(struct opa_vnic_adapter *adapter,
772772
}
773773

774774
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);
776776
if (IS_ERR(ah)) {
777777
c_err("%s:Couldn't create new AH = %p\n", __func__, ah);
778778
c_err("%s:dlid = %d, sl = %d, port = %d\n", __func__,

include/rdma/ib_verbs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,14 +2720,14 @@ struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags,
27202720
void ib_dealloc_pd(struct ib_pd *pd);
27212721

27222722
/**
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.
27242724
* @pd: The protection domain associated with the address handle.
27252725
* @ah_attr: The attributes of the address vector.
27262726
*
27272727
* The address handle is used to reference a local or global destination
27282728
* in all UD QP post sends.
27292729
*/
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);
27312731

27322732
/**
27332733
* ib_get_gids_from_rdma_hdr - Get sgid and dgid from GRH or IPv4 header

0 commit comments

Comments
 (0)