4 files changed, 20 insertions, 23 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 4895c341e46d..8f067497c212 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -278,8 +278,8 @@ 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), NIP6_FMT,
-                                 NIP6(sin->sin6_addr));
+                        snprintf(servername, sizeof(servername), "%pI6",
+                                 &sin->sin6_addr);
                         break;
                 }
                 default:
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 41013dd66ac3..4c8adadc214d 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -305,9 +305,9 @@ 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), NIP6_FMT".%u.%u",
-                                NIP6(address_to_register->sin6_addr),
-                                port >> 8, port & 0xff);
+                snprintf(buf, sizeof(buf), "%pI6.%u.%u",
+                         &address_to_register->sin6_addr,
+                         port >> 8, port & 0xff);
         map->r_addr = buf;
 
         dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index f24800f2c098..16f714a247bc 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -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, NIP6_FMT, NIP6(im->m_addr));
+                snprintf(text_addr, 40, "%pI6", &im->m_addr);
         }
         qword_add(bpp, blen, im->m_class);
         qword_add(bpp, blen, text_addr);
@@ -214,7 +214,7 @@ static int ip_map_parse(struct cache_detail *cd,
                 addr.s6_addr32[2] = htonl(0xffff);
                 addr.s6_addr32[3] =
                         htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);
-       } else if (sscanf(buf, NIP6_FMT "%c",
+       } else if (sscanf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x%c",
                         &b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &c) == 8) {
                 addr.s6_addr16[0] = htons(b1);
                 addr.s6_addr16[1] = htons(b2);
@@ -286,8 +286,7 @@ static int ip_map_show(struct seq_file *m,
                         ntohl(addr.s6_addr32[3]) >>  0 & 0xff,
                         dom);
         } else {
-                seq_printf(m, "%s " NIP6_FMT " %s\n",
-                        im->m_class, NIP6(addr), dom);
+                seq_printf(m, "%s %pI6 %s\n", im->m_class, &addr, dom);
         }
         return 0;
 }
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 0a50361e3d83..82a9b6286dd3 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -342,8 +342,7 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(40, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 40, NIP6_FMT,
-                                NIP6(addr->sin6_addr));
+                snprintf(buf, 40, "%pI6",&addr->sin6_addr);
         }
         xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
 
@@ -358,18 +357,17 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(64, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 64, "addr="NIP6_FMT" port=%u proto=%s",
-                                NIP6(addr->sin6_addr),
+                snprintf(buf, 64, "addr=%pI6 port=%u proto=%s",
+                                &addr->sin6_addr,
                                 ntohs(addr->sin6_port),
                                 protocol);
         }
         xprt->address_strings[RPC_DISPLAY_ALL] = buf;
 
         buf = kzalloc(36, GFP_KERNEL);
-        if (buf) {
-                snprintf(buf, 36, NIP6_SEQFMT,
-                                NIP6(addr->sin6_addr));
-        }
+        if (buf)
+                snprintf(buf, 36, "%pi6", &addr->sin6_addr);
+
         xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = buf;
 
         buf = kzalloc(8, GFP_KERNEL);
@@ -381,10 +379,10 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
 
         buf = kzalloc(50, GFP_KERNEL);
         if (buf) {
-                snprintf(buf, 50, NIP6_FMT".%u.%u",
-                                NIP6(addr->sin6_addr),
-                                ntohs(addr->sin6_port) >> 8,
-                                ntohs(addr->sin6_port) & 0xff);
+                snprintf(buf, 50, "%pI6.%u.%u",
+                         &addr->sin6_addr,
+                         ntohs(addr->sin6_port) >> 8,
+                         ntohs(addr->sin6_port) & 0xff);
         }
         xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
 
@@ -1448,8 +1446,8 @@ static int xs_bind6(struct sock_xprt *transport, struct socket *sock)
                 if (port > last)
                         nloop++;
         } while (err == -EADDRINUSE && nloop != 2);
-        dprintk("RPC:       xs_bind6 "NIP6_FMT":%u: %s (%d)\n",
-                NIP6(myaddr.sin6_addr), port, err ? "failed" : "ok", err);
+        dprintk("RPC:       xs_bind6 %pI6:%u: %s (%d)\n",
+                &myaddr.sin6_addr, port, err ? "failed" : "ok", err);
         return err;
 }