Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

IB/{core, cm, cma, ipoib}: Rename ib_init_ah_from_path to ib_init_ah_attr_from_path

Browse Source 
Since ib_init_ah_from_path initializes the address handle attribute, it is
renamed to reflect so.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Parav Pandit 2017-11-14 14:52:16 +02:00 committed by Jason Gunthorpe
parent 33f93e1ebc
commit 4ad6a0245e
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/core/cm.c
View File

@ -494,8 +494,8 @@ static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av,
return ret; return ret;
av->port = port; av->port = port;
ret = ib_init_ah_from_path(cm_dev->ib_device, port->port_num, path, ret = ib_init_ah_attr_from_path(cm_dev->ib_device, port->port_num, path,
&av->ah_attr); &av->ah_attr);
if (ret) if (ret)
return ret; return ret;

7
drivers/infiniband/core/cma.c
View File

@ -3396,9 +3396,10 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
event.status = ret; event.status = ret;
break; break;
} }
ib_init_ah_from_path(id_priv->id.device, id_priv->id.port_num, ib_init_ah_attr_from_path(id_priv->id.device,
id_priv->id.route.path_rec, id_priv->id.port_num,
&event.param.ud.ah_attr); id_priv->id.route.path_rec,
&event.param.ud.ah_attr);
event.param.ud.qp_num = rep->qpn; event.param.ud.qp_num = rep->qpn;
event.param.ud.qkey = rep->qkey; event.param.ud.qkey = rep->qkey;
event.event = RDMA_CM_EVENT_ESTABLISHED; event.event = RDMA_CM_EVENT_ESTABLISHED;

8
drivers/infiniband/core/sa_query.c
View File

@ -1227,9 +1227,9 @@ static u8 get_src_path_mask(struct ib_device *device, u8 port_num)
return src_path_mask; return src_path_mask;
} }
int ib_init_ah_from_path(struct ib_device *device, u8 port_num, int ib_init_ah_attr_from_path(struct ib_device *device, u8 port_num,
struct sa_path_rec *rec, struct sa_path_rec *rec,
struct rdma_ah_attr *ah_attr) struct rdma_ah_attr *ah_attr)
{ {
int ret; int ret;
u16 gid_index; u16 gid_index;
@ -1341,7 +1341,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
return 0; return 0;
} }
EXPORT_SYMBOL(ib_init_ah_from_path); EXPORT_SYMBOL(ib_init_ah_attr_from_path);
static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask) static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
{ {

3
drivers/infiniband/ulp/ipoib/ipoib_main.c
View File

@ -768,7 +768,8 @@ static void path_rec_completion(int status,
if (!status) { if (!status) {
struct rdma_ah_attr av; struct rdma_ah_attr av;
if (!ib_init_ah_from_path(priv->ca, priv->port, pathrec, &av)) if (!ib_init_ah_attr_from_path(priv->ca, priv->port,
pathrec, &av))
ah = ipoib_create_ah(dev, priv->pd, &av); ah = ipoib_create_ah(dev, priv->pd, &av);
} }

10
include/rdma/ib_sa.h
View File

@ -549,12 +549,12 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num,
struct rdma_ah_attr *ah_attr); struct rdma_ah_attr *ah_attr);
/** /**
* ib_init_ah_from_path - Initialize address handle attributes based on an SA * ib_init_ah_attr_from_path - Initialize address handle attributes based on
* path record. * an SA path record.
*/ */
int ib_init_ah_from_path(struct ib_device *device, u8 port_num, int ib_init_ah_attr_from_path(struct ib_device *device, u8 port_num,
struct sa_path_rec *rec, struct sa_path_rec *rec,
struct rdma_ah_attr *ah_attr); struct rdma_ah_attr *ah_attr);
/** /**
* ib_sa_pack_path - Conert a path record from struct ib_sa_path_rec * ib_sa_pack_path - Conert a path record from struct ib_sa_path_rec