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

Commit 45a290f8 authored by Zhu Yanjun's avatar Zhu Yanjun Committed by Doug Ledford
Browse files

IB/rxe: change the function rxe_av_fill_ip_info to void 



The function rxe_av_fill_ip_info always returns 0. So the function
type is changed to void.

CC: Srinivas Eeda <srinivas.eeda@oracle.com>
CC: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarZhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a402dc44

drivers/infiniband/sw/rxe/rxe_av.c

+1 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ void rxe_av_to_attr(struct rxe_av *av, struct rdma_ah_attr *attr) 
	rdma_ah_set_port_num(attr, av->port_num);

}



int rxe_av_fill_ip_info(struct rxe_dev *rxe,

void rxe_av_fill_ip_info(struct rxe_dev *rxe,

			struct rxe_av *av,

			struct rdma_ah_attr *attr,

			struct ib_gid_attr *sgid_attr,
@@ -78,8 +78,6 @@ int rxe_av_fill_ip_info(struct rxe_dev *rxe, 
	rdma_gid2ip(&av->sgid_addr._sockaddr, sgid);

	rdma_gid2ip(&av->dgid_addr._sockaddr, &rdma_ah_read_grh(attr)->dgid);

	av->network_type = ib_gid_to_network_type(sgid_attr->gid_type, sgid);



	return 0;

}



struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt)

drivers/infiniband/sw/rxe/rxe_loc.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void rxe_av_from_attr(u8 port_num, struct rxe_av *av, 


void rxe_av_to_attr(struct rxe_av *av, struct rdma_ah_attr *attr);



int rxe_av_fill_ip_info(struct rxe_dev *rxe,

void rxe_av_fill_ip_info(struct rxe_dev *rxe,

			struct rxe_av *av,

			struct rdma_ah_attr *attr,

			struct ib_gid_attr *sgid_attr,

drivers/infiniband/sw/rxe/rxe_verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -272,11 +272,11 @@ static int rxe_init_av(struct rxe_dev *rxe, struct rdma_ah_attr *attr, 
	}



	rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr);

	err = rxe_av_fill_ip_info(rxe, av, attr, &sgid_attr, &sgid);

	rxe_av_fill_ip_info(rxe, av, attr, &sgid_attr, &sgid);



	if (sgid_attr.ndev)

		dev_put(sgid_attr.ndev);

	return err;

	return 0;

}



static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd,