diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 4 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index ed6c54cae7b..e11bce6ab63 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -1601,14 +1601,14 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock, | |||
1601 | case AF_INET: | 1601 | case AF_INET: |
1602 | sin = (struct sockaddr_in *)addr; | 1602 | sin = (struct sockaddr_in *)addr; |
1603 | spin_lock_bh(&conn->session->lock); | 1603 | spin_lock_bh(&conn->session->lock); |
1604 | sprintf(buf, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr)); | 1604 | sprintf(buf, "%pI4", &sin->sin_addr.s_addr); |
1605 | *port = be16_to_cpu(sin->sin_port); | 1605 | *port = be16_to_cpu(sin->sin_port); |
1606 | spin_unlock_bh(&conn->session->lock); | 1606 | spin_unlock_bh(&conn->session->lock); |
1607 | break; | 1607 | break; |
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, "%pI6", &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; |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index db7ea3bb4e8..eb3a414b189 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -206,8 +206,7 @@ static int qla4xxx_conn_get_param(struct iscsi_cls_conn *conn, | |||
206 | break; | 206 | break; |
207 | case ISCSI_PARAM_CONN_ADDRESS: | 207 | case ISCSI_PARAM_CONN_ADDRESS: |
208 | /* TODO: what are the ipv6 bits */ | 208 | /* TODO: what are the ipv6 bits */ |
209 | len = sprintf(buf, "%u.%u.%u.%u\n", | 209 | len = sprintf(buf, "%pI4\n", &ddb_entry->ip_addr); |
210 | NIPQUAD(ddb_entry->ip_addr)); | ||
211 | break; | 210 | break; |
212 | default: | 211 | default: |
213 | return -ENOSYS; | 212 | return -ENOSYS; |