From 4513e2441bfc7c72870f4d0385117fb5563b6b0d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 4 Sep 2014 13:02:42 +0000 Subject: [PATCH] iscsi-scst: Build fix for IPV6=n (merge r5732 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5770 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/conn.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/iscsi-scst/kernel/conn.c b/iscsi-scst/kernel/conn.c index 4c1fd5678..7407ab195 100644 --- a/iscsi-scst/kernel/conn.c +++ b/iscsi-scst/kernel/conn.c @@ -104,6 +104,7 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session) "%pI4", &inet_sk(sk)->inet_daddr); #endif break; +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) case AF_INET6: #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) snprintf(buf, sizeof(buf), @@ -117,6 +118,7 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session) &sk->sk_v6_daddr); #endif break; +#endif default: snprintf(buf, sizeof(buf), "Unknown family %d", sk->sk_family); @@ -170,6 +172,7 @@ static ssize_t iscsi_get_initiator_ip(struct iscsi_conn *conn, "%pI4", &inet_sk(sk)->inet_daddr); #endif break; +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) case AF_INET6: #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) pos = scnprintf(buf, size, @@ -184,6 +187,7 @@ static ssize_t iscsi_get_initiator_ip(struct iscsi_conn *conn, #endif #endif break; +#endif default: pos = scnprintf(buf, size, "Unknown family %d", sk->sk_family);