Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad6a024 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

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



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

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 33f93e1e

drivers/infiniband/core/cm.c

+2 −2
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int cm_init_av_by_path(struct sa_path_rec *path, struct cm_av *av, 
		return ret;



	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);

	if (ret)

		return ret;

drivers/infiniband/core/cma.c

+4 −3
Original line number Diff line number Diff line
@@ -3396,7 +3396,8 @@ static int cma_sidr_rep_handler(struct ib_cm_id *cm_id, 
			event.status = ret;

			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.port_num,

					  id_priv->id.route.path_rec,

					  &event.param.ud.ah_attr);

		event.param.ud.qp_num = rep->qpn;

drivers/infiniband/core/sa_query.c

+4 −4
Original line number Diff line number Diff line
@@ -1227,7 +1227,7 @@ static u8 get_src_path_mask(struct ib_device *device, u8 port_num) 
	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 rdma_ah_attr *ah_attr)

{
@@ -1341,7 +1341,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, 


	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)

{

drivers/infiniband/ulp/ipoib/ipoib_main.c

+2 −1
Original line number Diff line number Diff line
@@ -768,7 +768,8 @@ static void path_rec_completion(int status, 
	if (!status) {

		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);

	}

include/rdma/ib_sa.h

+5 −5
Original line number Diff line number Diff line
@@ -549,10 +549,10 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num, 
			     struct rdma_ah_attr *ah_attr);



/**

 * ib_init_ah_from_path - Initialize address handle attributes based on an SA

 *   path record.

 * ib_init_ah_attr_from_path - Initialize address handle attributes based on

 *   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 rdma_ah_attr *ah_attr);