aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-01-12 17:41:20 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-02-10 08:30:53 -0500
commit7a88efe9760de3bc75bde61b0a4c56dbb6cf2494 (patch)
tree36a5691bda0105a57ab84c376adf0afa3346e0b0 /net
parentf1a89a118299df9e5afbaaedf83e5709a28632b6 (diff)
SUNRPC: Don't display zero scope IDs
A zero scope ID means that it wasn't set, so we don't need to append it to presentation format addresses. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Acked-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/addr.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
index 0756c5da12f4..f845d9d72f73 100644
--- a/net/sunrpc/addr.c
+++ b/net/sunrpc/addr.c
@@ -73,6 +73,8 @@ static size_t rpc_ntop6(const struct sockaddr *sap,
73 73
74 if (!(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL)) 74 if (!(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL))
75 return len; 75 return len;
76 if (sin6->sin6_scope_id == 0)
77 return len;
76 78
77 rc = snprintf(scopebuf, sizeof(scopebuf), "%c%u", 79 rc = snprintf(scopebuf, sizeof(scopebuf), "%c%u",
78 IPV6_SCOPE_DELIMITER, sin6->sin6_scope_id); 80 IPV6_SCOPE_DELIMITER, sin6->sin6_scope_id);