diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2006-12-17 13:10:27 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-06 10:01:38 -0500 |
commit | 94cb3f822bb806a750e1e1c8457bee6e96671569 (patch) | |
tree | 29a5ca76025a85b99cd0390cd8e5da614cb7443c /drivers/scsi/iscsi_tcp.c | |
parent | 09492605aa3e17ce19572b9e925ecf66e4da55dd (diff) |
[SCSI] iscsi: simplify IPv6 and IPv4 address printing
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/iscsi_tcp.c')
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 888968631471..437684084377 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -2044,13 +2044,11 @@ iscsi_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn, | |||
2044 | sk = tcp_conn->sock->sk; | 2044 | sk = tcp_conn->sock->sk; |
2045 | if (sk->sk_family == PF_INET) { | 2045 | if (sk->sk_family == PF_INET) { |
2046 | inet = inet_sk(sk); | 2046 | inet = inet_sk(sk); |
2047 | len = sprintf(buf, "%u.%u.%u.%u\n", | 2047 | len = sprintf(buf, NIPQUAD_FMT "\n", |
2048 | NIPQUAD(inet->daddr)); | 2048 | NIPQUAD(inet->daddr)); |
2049 | } else { | 2049 | } else { |
2050 | np = inet6_sk(sk); | 2050 | np = inet6_sk(sk); |
2051 | len = sprintf(buf, | 2051 | len = sprintf(buf, NIP6_FMT "\n", NIP6(np->daddr)); |
2052 | "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", | ||
2053 | NIP6(np->daddr)); | ||
2054 | } | 2052 | } |
2055 | mutex_unlock(&conn->xmitmutex); | 2053 | mutex_unlock(&conn->xmitmutex); |
2056 | break; | 2054 | break; |