From 8019c8cd3d561bc217844beff40875cdaa0544ed Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 9 Jul 2021 03:30:28 +0000 Subject: [PATCH] isert-scst: Simplify the code that reports that a connection has been accepted git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9474 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/iser_rdma.c | 32 ++---------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index ba62686d9..d3d96ab71 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -1525,36 +1525,8 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id, goto fail_accept; } - switch (isert_conn->peer_addr.ss_family) { - case AF_INET: -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - PRINT_INFO("iser accepted connection cm_id:%p " - NIPQUAD_FMT "->" NIPQUAD_FMT, cm_id, - NIPQUAD(((struct sockaddr_in *)&isert_conn->peer_addr)->sin_addr.s_addr), - NIPQUAD(((struct sockaddr_in *)&isert_conn->self_addr)->sin_addr.s_addr)); -#else - PRINT_INFO("iser accepted connection cm_id:%p %pI4->%pI4", - cm_id, - &((struct sockaddr_in *)&isert_conn->peer_addr)->sin_addr.s_addr, - &((struct sockaddr_in *)&isert_conn->self_addr)->sin_addr.s_addr); -#endif - break; - case AF_INET6: -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) - PRINT_INFO("iser accepted connection cm_id:%p " - NIP6_FMT "->" NIP6_FMT, cm_id, - NIP6(((struct sockaddr_in6 *)&isert_conn->peer_addr)->sin6_addr), - NIP6(((struct sockaddr_in6 *)&isert_conn->self_addr)->sin6_addr)); -#else - PRINT_INFO("iser accepted connection cm_id:%p %pI6->%pI6", - cm_id, - &((struct sockaddr_in6 *)&isert_conn->peer_addr)->sin6_addr, - &((struct sockaddr_in6 *)&isert_conn->self_addr)->sin6_addr); -#endif - break; - default: - PRINT_INFO("iser accepted connection cm_id:%p", cm_id); - } + PRINT_INFO("iser accepted connection cm_id:%p %pISpc->%pISpc", + cm_id, &isert_conn->peer_addr, &isert_conn->self_addr); mutex_lock(&dev_list_mutex); list_add_tail(&isert_conn->portal_node, &portal->conn_list);