From 7f173868dc5594d86a4d70fbcd03d968577b8e98 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 17:03:38 +0000 Subject: [PATCH] Merge r7517 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7769 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/conn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/conn.c b/iscsi-scst/kernel/conn.c index 4aff2a69d..82845890f 100644 --- a/iscsi-scst/kernel/conn.c +++ b/iscsi-scst/kernel/conn.c @@ -196,14 +196,14 @@ static ssize_t iscsi_get_target_ip(struct iscsi_conn *conn, switch (sk->sk_family) { case AF_INET: pos = scnprintf(buf, size, -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->saddr)); #else "%pI4", &inet_sk(sk)->inet_saddr); #endif break; case AF_INET6: -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) pos = scnprintf(buf, size, "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]", NIP6(inet6_sk(sk)->saddr));