This is a note to let you know that I've just added the patch titled RDMA/irdma: Remove the unnecessary variable saddr to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: rdma-irdma-remove-the-unnecessary-variable-saddr.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit 73c68da08750317f0e2feb3ffc9203816d04a8b2 Author: Zhu Yanjun <yanjun.zhu@xxxxxxxxx> Date: Tue Feb 22 21:42:51 2022 -0500 RDMA/irdma: Remove the unnecessary variable saddr [ 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@xxxxxxxxx Signed-off-by: Zhu Yanjun <yanjun.zhu@xxxxxxxxx> Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxx> Stable-dep-of: 34acb833cc83 ("RDMA/irdma: Validate udata inlen and outlen") Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> 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;