RDMA/core: Avoid unnecessary sa_family overwrite
authorParav Pandit <parav@mellanox.com>
Wed, 5 Sep 2018 09:54:17 +0000 (12:54 +0300)
committerJason Gunthorpe <jgg@mellanox.com>
Wed, 12 Sep 2018 21:48:08 +0000 (15:48 -0600)
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>
drivers/infiniband/core/addr.c

index 50ab50f1908b57ff7b32f4bbd14f635d426d81f6..858ceffbeeaafa203b883b42ff1d16a8202ecd0a 100644 (file)
@@ -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
@@ -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