net: replace %p6 with %pI6
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
4b7a4274ca
commit
5b095d9892
@@ -278,7 +278,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
|
||||
case AF_INET6: {
|
||||
struct sockaddr_in6 *sin =
|
||||
(struct sockaddr_in6 *)args->address;
|
||||
snprintf(servername, sizeof(servername), "%p6",
|
||||
snprintf(servername, sizeof(servername), "%pI6",
|
||||
&sin->sin6_addr);
|
||||
break;
|
||||
}
|
||||
|
@@ -305,7 +305,7 @@ static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,
|
||||
snprintf(buf, sizeof(buf), "::.%u.%u",
|
||||
port >> 8, port & 0xff);
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "%p6.%u.%u",
|
||||
snprintf(buf, sizeof(buf), "%pI6.%u.%u",
|
||||
&address_to_register->sin6_addr,
|
||||
port >> 8, port & 0xff);
|
||||
map->r_addr = buf;
|
||||
|
@@ -168,7 +168,7 @@ static void ip_map_request(struct cache_detail *cd,
|
||||
ntohl(im->m_addr.s6_addr32[3]) >> 8 & 0xff,
|
||||
ntohl(im->m_addr.s6_addr32[3]) >> 0 & 0xff);
|
||||
} else {
|
||||
snprintf(text_addr, 40, "%p6", &im->m_addr);
|
||||
snprintf(text_addr, 40, "%pI6", &im->m_addr);
|
||||
}
|
||||
qword_add(bpp, blen, im->m_class);
|
||||
qword_add(bpp, blen, text_addr);
|
||||
@@ -286,7 +286,7 @@ static int ip_map_show(struct seq_file *m,
|
||||
ntohl(addr.s6_addr32[3]) >> 0 & 0xff,
|
||||
dom);
|
||||
} else {
|
||||
seq_printf(m, "%s %p6 %s\n", im->m_class, &addr, dom);
|
||||
seq_printf(m, "%s %pI6 %s\n", im->m_class, &addr, dom);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@@ -341,7 +341,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
|
||||
|
||||
buf = kzalloc(40, GFP_KERNEL);
|
||||
if (buf) {
|
||||
snprintf(buf, 40, "%p6",&addr->sin6_addr);
|
||||
snprintf(buf, 40, "%pI6",&addr->sin6_addr);
|
||||
}
|
||||
xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
|
||||
|
||||
@@ -356,7 +356,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
|
||||
|
||||
buf = kzalloc(64, GFP_KERNEL);
|
||||
if (buf) {
|
||||
snprintf(buf, 64, "addr=%p6 port=%u proto=%s",
|
||||
snprintf(buf, 64, "addr=%pI6 port=%u proto=%s",
|
||||
&addr->sin6_addr,
|
||||
ntohs(addr->sin6_port),
|
||||
protocol);
|
||||
@@ -378,7 +378,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
|
||||
|
||||
buf = kzalloc(50, GFP_KERNEL);
|
||||
if (buf) {
|
||||
snprintf(buf, 50, "%p6.%u.%u",
|
||||
snprintf(buf, 50, "%pI6.%u.%u",
|
||||
&addr->sin6_addr,
|
||||
ntohs(addr->sin6_port) >> 8,
|
||||
ntohs(addr->sin6_port) & 0xff);
|
||||
@@ -1407,7 +1407,7 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock)
|
||||
if (port > last)
|
||||
nloop++;
|
||||
} while (err == -EADDRINUSE && nloop != 2);
|
||||
dprintk("RPC: xs_bind6 %p6:%u: %s (%d)\n",
|
||||
dprintk("RPC: xs_bind6 %pI6:%u: %s (%d)\n",
|
||||
&myaddr.sin6_addr, port, err ? "failed" : "ok", err);
|
||||
return err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user