diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c index 635d429c2..93b865400 100644 --- a/iscsi-scst/kernel/isert-scst/iser_rdma.c +++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c @@ -36,6 +36,8 @@ #include #include +#include +#include #include "iser.h" #include "iser_datamover.h" @@ -1305,8 +1307,8 @@ static int isert_cm_conn_req_handler(struct rdma_cm_id *cm_id, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) pr_info("iser accepted connection cm_id:%p " NIP6_FMT "->" NIP6_FMT "\n", cm_id, - NIP6(((struct sockaddr_in6 *)&isert_conn->peer_addr)->sin6_addr.s_addr), - NIP6(((struct sockaddr_in6 *)&isert_conn->self_addr)->sin6_addr.s_addr)); + NIP6(((struct sockaddr_in6 *)&isert_conn->peer_addr)->sin6_addr), + NIP6(((struct sockaddr_in6 *)&isert_conn->self_addr)->sin6_addr)); #else pr_info("iser accepted connection cm_id:%p " "%pI6->%pI6\n", cm_id, @@ -1638,7 +1640,7 @@ int isert_portal_listen(struct isert_portal *portal, pr_info("iser portal cm_id:%p listens on: " NIP6_FMT " %d\n", portal->cm_id, - NIP6(((struct sockaddr_in6 *)sa)->sin6_addr.s_addr), + NIP6(((struct sockaddr_in6 *)sa)->sin6_addr), (int)ntohs(((struct sockaddr_in6 *)sa)->sin6_port)); #else pr_info("iser portal cm_id:%p listens on: " diff --git a/iscsi-scst/kernel/isert-scst/isert.c b/iscsi-scst/kernel/isert-scst/isert.c index 40c50acfd..324ebefa9 100644 --- a/iscsi-scst/kernel/isert-scst/isert.c +++ b/iscsi-scst/kernel/isert-scst/isert.c @@ -36,6 +36,8 @@ #include #include #include +#include +#include #ifdef INSIDE_KERNEL_TREE #include @@ -435,7 +437,7 @@ static ssize_t isert_get_initiator_ip(struct iscsi_conn *conn, #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) pos = scnprintf(buf, size, "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]", - NIP6(((struct sockaddr_in6 *)&ss)->sin6_addr.s_addr)); + NIP6(((struct sockaddr_in6 *)&ss)->sin6_addr)); #else pos = scnprintf(buf, size, "[%p6]", &((struct sockaddr_in6 *)&ss)->sin6_addr);