diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-04 05:27:36 +0300 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-04 05:27:36 +0300 |
| commit | 7285f2d2ffd4b7ab4ffb70a47759ee209c30017b (patch) | |
| tree | 255cdddc72429f013b3bcf5c51d1818cb3e3bd51 /net/sunrpc/addr.c | |
| parent | 0b08b07507d5ae733408fd4ebda1cd89d3a840ef (diff) | |
| parent | 44ed3556bad809797f7b06a4a88918fd8a23d6fe (diff) | |
| download | linux-7285f2d2ffd4b7ab4ffb70a47759ee209c30017b.tar.xz | |
Merge branch 'devel' into linux-next
Diffstat (limited to 'net/sunrpc/addr.c')
| -rw-r--r-- | net/sunrpc/addr.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index c7450c8f0a7c..6dcdd2517819 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c @@ -55,16 +55,8 @@ static size_t rpc_ntop6_noscopeid(const struct sockaddr *sap, /* * RFC 4291, Section 2.2.1 - * - * To keep the result as short as possible, especially - * since we don't shorthand, we don't want leading zeros - * in each halfword, so avoid %pI6. */ - return snprintf(buf, buflen, "%x:%x:%x:%x:%x:%x:%x:%x", - ntohs(addr->s6_addr16[0]), ntohs(addr->s6_addr16[1]), - ntohs(addr->s6_addr16[2]), ntohs(addr->s6_addr16[3]), - ntohs(addr->s6_addr16[4]), ntohs(addr->s6_addr16[5]), - ntohs(addr->s6_addr16[6]), ntohs(addr->s6_addr16[7])); + return snprintf(buf, buflen, "%pI6c", addr); } static size_t rpc_ntop6(const struct sockaddr *sap, |