git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' into next
[pandora-kernel.git]
/
fs
/
lockd
/
host.c
diff --git
a/fs/lockd/host.c
b/fs/lockd/host.c
index
acc2aa5
..
abdebf7
100644
(file)
--- a/
fs/lockd/host.c
+++ b/
fs/lockd/host.c
@@
-116,14
+116,14
@@
static void nlm_display_address(const struct sockaddr *sap,
snprintf(buf, len, "unspecified");
break;
case AF_INET:
snprintf(buf, len, "unspecified");
break;
case AF_INET:
- snprintf(buf, len,
NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr)
);
+ snprintf(buf, len,
"%pI4", &sin->sin_addr.s_addr
);
break;
case AF_INET6:
if (ipv6_addr_v4mapped(&sin6->sin6_addr))
break;
case AF_INET6:
if (ipv6_addr_v4mapped(&sin6->sin6_addr))
- snprintf(buf, len,
NIPQUAD_FMT
,
-
NIPQUAD(sin6->sin6_addr.s6_addr32[3])
);
+ snprintf(buf, len,
"%pI4"
,
+
&sin6->sin6_addr.s6_addr32[3]
);
else
else
- snprintf(buf, len,
NIP6_FMT, NIP6(sin6->sin6_addr)
);
+ snprintf(buf, len,
"%pI6", &sin6->sin6_addr
);
break;
default:
snprintf(buf, len, "unsupported address family");
break;
default:
snprintf(buf, len, "unsupported address family");