diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-10-31 03:54:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:54:56 -0400 |
commit | 21454aaad30651ba0dcc16fe5271bc12ee21f132 (patch) | |
tree | eb525494d6f80a0e855840bc588ae1f422348b04 /net/sunrpc/rpcb_clnt.c | |
parent | 14d5e834f6b36667c7da56374645f99b6cf30814 (diff) |
net: replace NIPQUAD() in net/*/
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 'net/sunrpc/rpcb_clnt.c')
-rw-r--r-- | net/sunrpc/rpcb_clnt.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index 4c8adadc214d..03ae007641e4 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c | |||
@@ -270,10 +270,9 @@ static int rpcb_register_netid4(struct sockaddr_in *address_to_register, | |||
270 | char buf[32]; | 270 | char buf[32]; |
271 | 271 | ||
272 | /* Construct AF_INET universal address */ | 272 | /* Construct AF_INET universal address */ |
273 | snprintf(buf, sizeof(buf), | 273 | snprintf(buf, sizeof(buf), "%pI4.%u.%u", |
274 | NIPQUAD_FMT".%u.%u", | 274 | &address_to_register->sin_addr.s_addr, |
275 | NIPQUAD(address_to_register->sin_addr.s_addr), | 275 | port >> 8, port & 0xff); |
276 | port >> 8, port & 0xff); | ||
277 | map->r_addr = buf; | 276 | map->r_addr = buf; |
278 | 277 | ||
279 | dprintk("RPC: %sregistering [%u, %u, %s, '%s'] with " | 278 | dprintk("RPC: %sregistering [%u, %u, %s, '%s'] with " |
@@ -422,8 +421,8 @@ int rpcb_getport_sync(struct sockaddr_in *sin, u32 prog, u32 vers, int prot) | |||
422 | struct rpc_clnt *rpcb_clnt; | 421 | struct rpc_clnt *rpcb_clnt; |
423 | int status; | 422 | int status; |
424 | 423 | ||
425 | dprintk("RPC: %s(" NIPQUAD_FMT ", %u, %u, %d)\n", | 424 | dprintk("RPC: %s(%pI4, %u, %u, %d)\n", |
426 | __func__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot); | 425 | __func__, &sin->sin_addr.s_addr, prog, vers, prot); |
427 | 426 | ||
428 | rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin, | 427 | rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin, |
429 | sizeof(*sin), prot, RPCBVERS_2); | 428 | sizeof(*sin), prot, RPCBVERS_2); |