RDMA/srp: Remove two casts

This patch does not change any functionality.

Link: https://lore.kernel.org/r/20190930231707.48259-7-bvanassche@acm.org
Cc: Honggang LI <honli@redhat.com>
Cc: Laurence Oberman <loberman@redhat.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index b596035..f015dc4 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -352,8 +352,8 @@ static int srp_new_rdma_cm_id(struct srp_rdma_ch *ch)
 
        init_completion(&ch->done);
        ret = rdma_resolve_addr(new_cm_id, target->rdma_cm.src_specified ?
-                               (struct sockaddr *)&target->rdma_cm.src : NULL,
-                               (struct sockaddr *)&target->rdma_cm.dst,
+                               &target->rdma_cm.src.sa : NULL,
+                               &target->rdma_cm.dst.sa,
                                SRP_PATH_REC_TIMEOUT_MS);
        if (ret) {
                pr_err("No route available from %pIS to %pIS (%d)\n",

diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index b2861cd..af99225 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -245,11 +245,13 @@ struct srp_target_port {
                        union {
                                struct sockaddr_in      ip4;
                                struct sockaddr_in6     ip6;
+                               struct sockaddr         sa;
                                struct sockaddr_storage ss;
                        } src;
                        union {
                                struct sockaddr_in      ip4;
                                struct sockaddr_in6     ip6;
+                               struct sockaddr         sa;
                                struct sockaddr_storage ss;
                        } dst;
                        bool src_specified;