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

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

IB/PVRDMA: Rename ib_ah_attr related functions 



Functions pvrdma_ah_attr_to_ib and ib_ah_attr_to_pvrdma have
been renamed so they are in sync wit the rename of the
ib_ah_attr structure

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 766b7f6c

drivers/infiniband/hw/vmw_pvrdma/pvrdma.h

+4 −4
Original line number Diff line number Diff line
@@ -440,9 +440,9 @@ void pvrdma_global_route_to_ib(struct ib_global_route *dst, 
			       const struct pvrdma_global_route *src);

void ib_global_route_to_pvrdma(struct pvrdma_global_route *dst,

			       const struct ib_global_route *src);

void pvrdma_ah_attr_to_ib(struct rdma_ah_attr *dst,

void pvrdma_ah_attr_to_rdma(struct rdma_ah_attr *dst,

			    const struct pvrdma_ah_attr *src);

void ib_ah_attr_to_pvrdma(struct pvrdma_ah_attr *dst,

void rdma_ah_attr_to_pvrdma(struct pvrdma_ah_attr *dst,

			    const struct rdma_ah_attr *src);



int pvrdma_uar_table_init(struct pvrdma_dev *dev);

drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c

+4 −4
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ void ib_global_route_to_pvrdma(struct pvrdma_global_route *dst, 
	dst->traffic_class = src->traffic_class;

}



void pvrdma_ah_attr_to_ib(struct rdma_ah_attr *dst,

void pvrdma_ah_attr_to_rdma(struct rdma_ah_attr *dst,

			    const struct pvrdma_ah_attr *src)

{

	pvrdma_global_route_to_ib(&dst->grh, &src->grh);
@@ -290,7 +290,7 @@ void pvrdma_ah_attr_to_ib(struct rdma_ah_attr *dst, 
	memcpy(&dst->dmac, &src->dmac, sizeof(dst->dmac));

}



void ib_ah_attr_to_pvrdma(struct pvrdma_ah_attr *dst,

void rdma_ah_attr_to_pvrdma(struct pvrdma_ah_attr *dst,

			    const struct rdma_ah_attr *src)

{

	ib_global_route_to_pvrdma(&dst->grh, &src->grh);

drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c

+4 −4
Original line number Diff line number Diff line
@@ -533,8 +533,8 @@ int pvrdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
	cmd->attrs.alt_port_num = attr->alt_port_num;

	cmd->attrs.alt_timeout = attr->alt_timeout;

	ib_qp_cap_to_pvrdma(&cmd->attrs.cap, &attr->cap);

	ib_ah_attr_to_pvrdma(&cmd->attrs.ah_attr, &attr->ah_attr);

	ib_ah_attr_to_pvrdma(&cmd->attrs.alt_ah_attr, &attr->alt_ah_attr);

	rdma_ah_attr_to_pvrdma(&cmd->attrs.ah_attr, &attr->ah_attr);

	rdma_ah_attr_to_pvrdma(&cmd->attrs.alt_ah_attr, &attr->alt_ah_attr);



	ret = pvrdma_cmd_post(dev, &req, &rsp, PVRDMA_CMD_MODIFY_QP_RESP);

	if (ret < 0) {
@@ -938,8 +938,8 @@ int pvrdma_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
	attr->alt_port_num = resp->attrs.alt_port_num;

	attr->alt_timeout = resp->attrs.alt_timeout;

	pvrdma_qp_cap_to_ib(&attr->cap, &resp->attrs.cap);

	pvrdma_ah_attr_to_ib(&attr->ah_attr, &resp->attrs.ah_attr);

	pvrdma_ah_attr_to_ib(&attr->alt_ah_attr, &resp->attrs.alt_ah_attr);

	pvrdma_ah_attr_to_rdma(&attr->ah_attr, &resp->attrs.ah_attr);

	pvrdma_ah_attr_to_rdma(&attr->alt_ah_attr, &resp->attrs.alt_ah_attr);



	qp->state = attr->qp_state;