+++ /dev/null
-From 2842d0266b44c2e797b1230d1540aae27a9769ef Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 22 Feb 2022 21:42:52 -0500
-Subject: RDMA/irdma: Move union irdma_sockaddr to header file
-
-From: Zhu Yanjun <yanjun.zhu@linux.dev>
-
-[ Upstream commit 884194ef264e140a6d22f7a5de2b76765d17734a ]
-
-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: Zhu Yanjun <yanjun.zhu@linux.dev>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Stable-dep-of: 34acb833cc83 ("RDMA/irdma: Validate udata inlen and outlen")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/hw/irdma/verbs.c | 17 +++--------------
- drivers/infiniband/hw/irdma/verbs.h | 11 +++++++----
- 2 files changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
-index e1b4bcaa62bb..7212f7f8818a 100644
---- a/drivers/infiniband/hw/irdma/verbs.c
-+++ b/drivers/infiniband/hw/irdma/verbs.c
-@@ -3952,11 +3952,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);
-@@ -4092,11 +4088,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))
-@@ -4174,10 +4166,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];
-
-diff --git a/drivers/infiniband/hw/irdma/verbs.h b/drivers/infiniband/hw/irdma/verbs.h
-index d2d4a7e5f954..541105b728e3 100644
---- a/drivers/infiniband/hw/irdma/verbs.h
-+++ b/drivers/infiniband/hw/irdma/verbs.h
-@@ -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;
- };
-
---
-2.35.1
-
+++ /dev/null
-From 73c68da08750317f0e2feb3ffc9203816d04a8b2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 22 Feb 2022 21:42:51 -0500
-Subject: RDMA/irdma: Remove the unnecessary variable saddr
-
-From: Zhu Yanjun <yanjun.zhu@linux.dev>
-
-[ Upstream commit 8627da62cc3b9de4d299f2558a9f16b4c3c13a5d ]
-
-Firstly the variable saddr was to check the type of a network. Now the
-variable net_type is used to do the same work. So it is removed.
-
-Link: https://lore.kernel.org/r/20220223024252.3873736-3-yanjun.zhu@linux.dev
-Signed-off-by: Zhu Yanjun <yanjun.zhu@linux.dev>
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Stable-dep-of: 34acb833cc83 ("RDMA/irdma: Validate udata inlen and outlen")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/infiniband/hw/irdma/verbs.c | 1 -
- drivers/infiniband/hw/irdma/verbs.h | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
-index 911902d2b93e..e1b4bcaa62bb 100644
---- a/drivers/infiniband/hw/irdma/verbs.c
-+++ b/drivers/infiniband/hw/irdma/verbs.c
-@@ -4175,7 +4175,6 @@ static int irdma_create_ah(struct ib_ah *ibah,
- struct irdma_ah_info *ah_info;
- struct irdma_create_ah_resp uresp;
- union {
-- struct sockaddr saddr;
- struct sockaddr_in saddr_in;
- struct sockaddr_in6 saddr_in6;
- } sgid_addr, dgid_addr;
-diff --git a/drivers/infiniband/hw/irdma/verbs.h b/drivers/infiniband/hw/irdma/verbs.h
-index d0fdef8d09ea..d2d4a7e5f954 100644
---- a/drivers/infiniband/hw/irdma/verbs.h
-+++ b/drivers/infiniband/hw/irdma/verbs.h
-@@ -29,7 +29,6 @@ struct irdma_av {
- u8 macaddr[16];
- struct rdma_ah_attr attrs;
- union {
-- struct sockaddr saddr;
- struct sockaddr_in saddr_in;
- struct sockaddr_in6 saddr_in6;
- } sgid_addr, dgid_addr;
---
-2.35.1
-