1 files changed, 4 insertions, 25 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index dc439a40da3f..403bd29443b8 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -3095,7 +3095,7 @@ out:
 
 static int
 isert_setup_np(struct iscsi_np *np,
-               struct __kernel_sockaddr_storage *ksockaddr)
+               struct sockaddr_storage *ksockaddr)
 {
         struct isert_np *isert_np;
         struct rdma_cm_id *isert_lid;
@@ -3117,7 +3117,7 @@ isert_setup_np(struct iscsi_np *np,
          * in iscsi_target_configfs.c code..
          */
         memcpy(&np->np_sockaddr, ksockaddr,
-               sizeof(struct __kernel_sockaddr_storage));
+               sizeof(struct sockaddr_storage));
 
         isert_lid = isert_setup_id(isert_np);
         if (IS_ERR(isert_lid)) {
@@ -3199,32 +3199,11 @@ isert_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn,
 {
         struct rdma_cm_id *cm_id = isert_conn->cm_id;
         struct rdma_route *cm_route = &cm_id->route;
-        struct sockaddr_in *sock_in;
-        struct sockaddr_in6 *sock_in6;
 
         conn->login_family = np->np_sockaddr.ss_family;
 
-        if (np->np_sockaddr.ss_family == AF_INET6) {
-                sock_in6 = (struct sockaddr_in6 *)&cm_route->addr.dst_addr;
-                snprintf(conn->login_ip, sizeof(conn->login_ip), "%pI6c",
-                         &sock_in6->sin6_addr.in6_u);
-                conn->login_port = ntohs(sock_in6->sin6_port);
-
-                sock_in6 = (struct sockaddr_in6 *)&cm_route->addr.src_addr;
-                snprintf(conn->local_ip, sizeof(conn->local_ip), "%pI6c",
-                         &sock_in6->sin6_addr.in6_u);
-                conn->local_port = ntohs(sock_in6->sin6_port);
-        } else {
-                sock_in = (struct sockaddr_in *)&cm_route->addr.dst_addr;
-                sprintf(conn->login_ip, "%pI4",
-                        &sock_in->sin_addr.s_addr);
-                conn->login_port = ntohs(sock_in->sin_port);
-
-                sock_in = (struct sockaddr_in *)&cm_route->addr.src_addr;
-                sprintf(conn->local_ip, "%pI4",
-                        &sock_in->sin_addr.s_addr);
-                conn->local_port = ntohs(sock_in->sin_port);
-        }
+        conn->login_sockaddr = cm_route->addr.dst_addr;
+        conn->local_sockaddr = cm_route->addr.src_addr;
 }
 
 static int