Skip to content

Commit

Permalink
RDMA/core: Avoid unnecessary sa_family overwrite
Browse files Browse the repository at this point in the history
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 <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
  • Loading branch information
Parav Pandit authored and Jason Gunthorpe committed Sep 12, 2018
1 parent caf1e3a commit f89b7df
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/infiniband/core/addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -429,10 +428,8 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
return ret;

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
Expand Down

0 comments on commit f89b7df

Please sign in to comment.