From 0597ac78c88e15a41352c3f88825dd1c9f89c245 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 11 Nov 2015 22:05:05 +0000 Subject: [PATCH] iscsi-scst: Fix IPv6 format specifications git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6670 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/conn.c | 4 ++-- iscsi-scst/kernel/iscsi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iscsi-scst/kernel/conn.c b/iscsi-scst/kernel/conn.c index 641d1bf79..de76de85d 100644 --- a/iscsi-scst/kernel/conn.c +++ b/iscsi-scst/kernel/conn.c @@ -116,10 +116,10 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session) "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]", NIP6(inet6_sk(sk)->daddr)); #elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) - snprintf(buf, sizeof(buf), "[%p6]", + snprintf(buf, sizeof(buf), "[%pI6]", &inet6_sk(sk)->daddr); #else - snprintf(buf, sizeof(buf), "[%p6]", + snprintf(buf, sizeof(buf), "[%pI6]", &sk->sk_v6_daddr); #endif break; diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index ff3c616f3..2bedfae17 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -3310,9 +3310,9 @@ static ssize_t iscsi_tcp_get_initiator_ip(struct iscsi_conn *conn, #else #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) && \ (!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7) - pos = scnprintf(buf, size, "[%p6]", &inet6_sk(sk)->daddr); + pos = scnprintf(buf, size, "[%pI6]", &inet6_sk(sk)->daddr); #else - pos = scnprintf(buf, size, "[%p6]", &sk->sk_v6_daddr); + pos = scnprintf(buf, size, "[%pI6]", &sk->sk_v6_daddr); #endif #endif break;