diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/firmware/iscsi_ibft.c | 4 | ||||
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 4353414a0b77..0a6472097a81 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
@@ -290,9 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip) | |||
290 | /* | 290 | /* |
291 | * IPv6 | 291 | * IPv6 |
292 | */ | 292 | */ |
293 | str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]), | 293 | str += sprintf(str, "%p6", ip); |
294 | ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]), | ||
295 | ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7])); | ||
296 | } | 294 | } |
297 | str += sprintf(str, "\n"); | 295 | str += sprintf(str, "\n"); |
298 | return str - buf; | 296 | return str - buf; |
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index ed6c54cae7b1..ef929aef7c12 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -1608,7 +1608,7 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock, | |||
1608 | case AF_INET6: | 1608 | case AF_INET6: |
1609 | sin6 = (struct sockaddr_in6 *)addr; | 1609 | sin6 = (struct sockaddr_in6 *)addr; |
1610 | spin_lock_bh(&conn->session->lock); | 1610 | spin_lock_bh(&conn->session->lock); |
1611 | sprintf(buf, NIP6_FMT, NIP6(sin6->sin6_addr)); | 1611 | sprintf(buf, "%p6", &sin6->sin6_addr); |
1612 | *port = be16_to_cpu(sin6->sin6_port); | 1612 | *port = be16_to_cpu(sin6->sin6_port); |
1613 | spin_unlock_bh(&conn->session->lock); | 1613 | spin_unlock_bh(&conn->session->lock); |
1614 | break; | 1614 | break; |