Merge branch 'devel' into next

[linux-2.6-block.git] / net / sunrpc / clnt.c

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 347f2a25abb6e76a60c2268d7d54415202260578..836f15c0c4a3489b6e9d5ba5a7bfc59514a0db3d 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -279,15 +279,15 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
                case AF_INET: {
                        struct sockaddr_in *sin =
                                        (struct sockaddr_in *)args->address;
-                       snprintf(servername, sizeof(servername), NIPQUAD_FMT,
-                                NIPQUAD(sin->sin_addr.s_addr));
+                       snprintf(servername, sizeof(servername), "%pI4",
+                                &sin->sin_addr.s_addr);
                        break;
                }
                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: