From 7d31dd3190e9f2dffe62a168ff6de066e059238c Mon Sep 17 00:00:00 2001 From: Parav Pandit Date: Wed, 5 Sep 2018 12:54:17 +0300 Subject: [PATCH 2665/2944] RDMA/core: Avoid unnecessary sa_family overwrite to #33066543 commit f89b7dfa33537bba9ee082a17a55242fc727e9f4 upstream. addr4_resolve() and addr6_resolve() are called by checking the value of sa_family. Both above functions overwrite the value after typecasting, this is not necessary. Signed-off-by: Parav Pandit Reviewed-by: Daniel Jurgens Signed-off-by: Leon Romanovsky Signed-off-by: Jason Gunthorpe Signed-off-by: Xuan Zhuo Acked-by: Dust Li --- drivers/infiniband/core/addr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index ed5266b..fa80c9f 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -392,7 +392,6 @@ static int addr4_resolve(struct sockaddr_in *src_in, if (ret) return ret; - src_in->sin_family = AF_INET; src_in->sin_addr.s_addr = fl4.saddr; /* If there's a gateway and type of device not ARPHRD_INFINIBAND, we're @@ -428,10 +427,8 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, return PTR_ERR(dst); rt = (struct rt6_info *)dst; - if (ipv6_addr_any(&src_in->sin6_addr)) { - src_in->sin6_family = AF_INET6; + if (ipv6_addr_any(&src_in->sin6_addr)) src_in->sin6_addr = fl6.saddr; - } /* If there's a gateway and type of device not ARPHRD_INFINIBAND, we're * definitely in RoCE v2 (as RoCE v1 isn't routable) set the network -- 1.8.3.1