diff --git a/[refs] b/[refs]
index 530f332e4538..f308fca34270 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1a89a118299df9e5afbaaedf83e5709a28632b6
+refs/heads/master: 7a88efe9760de3bc75bde61b0a4c56dbb6cf2494
diff --git a/trunk/net/sunrpc/addr.c b/trunk/net/sunrpc/addr.c
index 0756c5da12f4..f845d9d72f73 100644
--- a/trunk/net/sunrpc/addr.c
+++ b/trunk/net/sunrpc/addr.c
@@ -73,6 +73,8 @@ static size_t rpc_ntop6(const struct sockaddr *sap,
 
 	if (!(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL))
 		return len;
+	if (sin6->sin6_scope_id == 0)
+		return len;
 
 	rc = snprintf(scopebuf, sizeof(scopebuf), "%c%u",
 			IPV6_SCOPE_DELIMITER, sin6->sin6_scope_id);