Commit 884194ef authored by Zhu Yanjun's avatar Zhu Yanjun Committed by Jason Gunthorpe
Browse files

RDMA/irdma: Move union irdma_sockaddr to header file 

The union irdma_sockaddr is used frequently. So move it to the header
file.

Link: https://lore.kernel.org/r/20220223024252.3873736-4-yanjun.zhu@linux.dev


Signed-off-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 8627da62

drivers/infiniband/hw/irdma/verbs.c

+3 −14
Original line number Diff line number Diff line
@@ -3882,11 +3882,7 @@ static int irdma_attach_mcast(struct ib_qp *ibqp, union ib_gid *ibgid, u16 lid) 
	int ret = 0;

	bool ipv4;

	u16 vlan_id;

	union {

		struct sockaddr saddr;

		struct sockaddr_in saddr_in;

		struct sockaddr_in6 saddr_in6;

	} sgid_addr;

	union irdma_sockaddr sgid_addr;

	unsigned char dmac[ETH_ALEN];



	rdma_gid2ip((struct sockaddr *)&sgid_addr, ibgid);
@@ -4022,11 +4018,7 @@ static int irdma_detach_mcast(struct ib_qp *ibqp, union ib_gid *ibgid, u16 lid) 
	struct irdma_mcast_grp_ctx_entry_info mcg_info = {};

	int ret;

	unsigned long flags;

	union {

		struct sockaddr saddr;

		struct sockaddr_in saddr_in;

		struct sockaddr_in6 saddr_in6;

	} sgid_addr;

	union irdma_sockaddr sgid_addr;



	rdma_gid2ip((struct sockaddr *)&sgid_addr, ibgid);

	if (!ipv6_addr_v4mapped((struct in6_addr *)ibgid))
@@ -4104,10 +4096,7 @@ static int irdma_create_ah(struct ib_ah *ibah, 
	u32 ah_id = 0;

	struct irdma_ah_info *ah_info;

	struct irdma_create_ah_resp uresp;

	union {

		struct sockaddr_in saddr_in;

		struct sockaddr_in6 saddr_in6;

	} sgid_addr, dgid_addr;

	union irdma_sockaddr sgid_addr, dgid_addr;

	int err;

	u8 dmac[ETH_ALEN];

drivers/infiniband/hw/irdma/verbs.h

+7 −4
Original line number Diff line number Diff line
@@ -25,13 +25,16 @@ struct irdma_pd { 
	struct irdma_sc_pd sc_pd;

};



union irdma_sockaddr {

	struct sockaddr_in saddr_in;

	struct sockaddr_in6 saddr_in6;

};



struct irdma_av {

	u8 macaddr[16];

	struct rdma_ah_attr attrs;

	union {

		struct sockaddr_in saddr_in;

		struct sockaddr_in6 saddr_in6;

	} sgid_addr, dgid_addr;

	union irdma_sockaddr sgid_addr;

	union irdma_sockaddr dgid_addr;

	u8 net_type;

};