From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 12 Jan 2010 22:41:20 +0000 (-0500)
Subject: SUNRPC: Don't display zero scope IDs
X-Git-Tag: v2.6.34-rc1~190^2~29
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7a88efe9760de3bc75bde61b0a4c56dbb6cf2494;p=~emulex%2Finfiniband.git

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>
---

diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
index 0756c5da12f..f845d9d72f7 100644
--- a/net/sunrpc/addr.c
+++ b/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);