diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 03:56:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:56:00 -0400 |
commit | 63779436ab4ad0867bcea53bf853b0004d7b895d (patch) | |
tree | bd4e49449eb852a54f62cc8bb1c807e26746dd43 /drivers/scsi | |
parent | 21454aaad30651ba0dcc16fe5271bc12ee21f132 (diff) |
drivers: replace NIPQUAD()
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/iscsi_tcp.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 24d09028a27f..e11bce6ab63c 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -1601,7 +1601,7 @@ 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; |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index db7ea3bb4e83..eb3a414b189a 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; |