Commit bfbfd661 authored by Dasaratharaman Chandramouli's avatar Dasaratharaman Chandramouli Committed by Doug Ledford
Browse files

IB/core: Rename ib_query_ah to rdma_query_ah 



Rename ib_query_ah to rdma_query_ah so its in sync with the
rename of the ib address handle attribute

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDon Hiatt <don.hiatt@intel.com>
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 67b985b6

drivers/infiniband/core/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -1847,7 +1847,7 @@ static inline int rcv_has_same_gid(const struct ib_mad_agent_private *mad_agent_ 
		/* both requests, or both responses. GIDs different */

		return 0;



	if (ib_query_ah(wr->send_buf.ah, &attr))

	if (rdma_query_ah(wr->send_buf.ah, &attr))

		/* Assume not equal, to avoid false positives. */

		return 0;

drivers/infiniband/core/mad_rmpp.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static int init_newwin(struct ib_mad_send_wr_private *mad_send_wr) 
		    (rmpp_recv->method & IB_MGMT_METHOD_RESP))

			continue;



		if (ib_query_ah(mad_send_wr->send_buf.ah, &ah_attr))

		if (rdma_query_ah(mad_send_wr->send_buf.ah, &ah_attr))

			continue;



		if (rmpp_recv->slid == ah_attr.dlid) {

drivers/infiniband/core/verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -579,13 +579,13 @@ int rdma_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr) 
}

EXPORT_SYMBOL(rdma_modify_ah);



int ib_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr)

int rdma_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr)

{

	return ah->device->query_ah ?

		ah->device->query_ah(ah, ah_attr) :

		-ENOSYS;

}

EXPORT_SYMBOL(ib_query_ah);

EXPORT_SYMBOL(rdma_query_ah);



int ib_destroy_ah(struct ib_ah *ah)

{

drivers/infiniband/hw/mlx4/mcg.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int send_mad_to_slave(int slave, struct mlx4_ib_demux_ctx *ctx, 
	if (!agent)

		return -EAGAIN;



	ib_query_ah(dev->sm_ah[ctx->port - 1], &ah_attr);

	rdma_query_ah(dev->sm_ah[ctx->port - 1], &ah_attr);



	if (ib_find_cached_pkey(&dev->ib_dev, ctx->port, IB_DEFAULT_PKEY_FULL, &wc.pkey_index))

		return -EINVAL;

include/rdma/ib_verbs.h

+2 −2
Original line number Diff line number Diff line
@@ -2787,13 +2787,13 @@ struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, const struct ib_wc *wc, 
int rdma_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);



/**

 * ib_query_ah - Queries the address vector associated with an address

 * rdma_query_ah - Queries the address vector associated with an address

 *   handle.

 * @ah: The address handle to query.

 * @ah_attr: The address vector attributes associated with the address

 *   handle.

 */

int ib_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);

int rdma_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);



/**

 * ib_destroy_ah - Destroys an address handle.

CRA Git | Maintained and supported by SUSTech CRA and CCSE