a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: replace NIP6_FMT with %p6 format specifier

Browse Source 
The iscsi_ibft.c changes are almost certainly a bugfix as the
pointer 'ip' is a u8 *, so they never print the last 8 bytes
of the IPv6 address, and the eight bytes they do print have
a zero byte with them in each 16-bit word.

Other than that, this should cause no difference in functionality.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Harvey Harrison 2008-10-28 16:06:44 -07:00 committed by David S. Miller
parent b071195deb
commit 1afa67f5e7
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/firmware/iscsi_ibft.c
View File

@ -290,9 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip)
/* /*
* IPv6 * IPv6
*/ */
str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]), str += sprintf(str, "%p6", ip);
ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]),
ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]));
} }
str += sprintf(str, "\n"); str += sprintf(str, "\n");
return str - buf; return str - buf;

2
drivers/scsi/iscsi_tcp.c
View File

@ -1608,7 +1608,7 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock,
case AF_INET6: case AF_INET6:
sin6 = (struct sockaddr_in6 *)addr; sin6 = (struct sockaddr_in6 *)addr;
spin_lock_bh(&conn->session->lock); spin_lock_bh(&conn->session->lock);
sprintf(buf, NIP6_FMT, NIP6(sin6->sin6_addr)); sprintf(buf, "%p6", &sin6->sin6_addr);
*port = be16_to_cpu(sin6->sin6_port); *port = be16_to_cpu(sin6->sin6_port);
spin_unlock_bh(&conn->session->lock); spin_unlock_bh(&conn->session->lock);
break; break;

2
fs/lockd/host.c
View File

@ -122,7 +122,7 @@ static void nlm_display_address(const struct sockaddr *sap,
snprintf(buf, len, NIPQUAD_FMT, snprintf(buf, len, NIPQUAD_FMT,
NIPQUAD(sin6->sin6_addr.s6_addr32[3])); NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
else else
snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr)); snprintf(buf, len, "%p6", &sin6->sin6_addr);
break; break;
default: default:
snprintf(buf, len, "unsupported address family"); snprintf(buf, len, "unsupported address family");

3
fs/nfs/super.c
View File

@ -468,8 +468,7 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
} }
case AF_INET6: { case AF_INET6: {
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap; struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
seq_printf(m, ",mountaddr=" NIP6_FMT, seq_printf(m, ",mountaddr=%p6", &sin6->sin6_addr);
NIP6(sin6->sin6_addr));
break; break;
} }
default: default:

2
security/selinux/avc.c
View File

@ -495,7 +495,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab,
char *name1, char *name2) char *name1, char *name2)
{ {
if (!ipv6_addr_any(addr)) if (!ipv6_addr_any(addr))
audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr)); audit_log_format(ab, " %s=%p6", name1, addr);
if (port) if (port)
audit_log_format(ab, " %s=%d", name2, ntohs(port)); audit_log_format(ab, " %s=%d", name2, ntohs(port));
} }