diff options
Diffstat (limited to 'net/sunrpc/addr.c')
| -rw-r--r-- | net/sunrpc/addr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 6dcdd2517819..f845d9d72f73 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c | |||
| @@ -71,8 +71,9 @@ static size_t rpc_ntop6(const struct sockaddr *sap, | |||
| 71 | if (unlikely(len == 0)) | 71 | if (unlikely(len == 0)) |
| 72 | return len; | 72 | return len; |
| 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 | !(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_SITELOCAL)) | 75 | return len; |
| 76 | if (sin6->sin6_scope_id == 0) | ||
| 76 | return len; | 77 | return len; |
| 77 | 78 | ||
| 78 | rc = snprintf(scopebuf, sizeof(scopebuf), "%c%u", | 79 | rc = snprintf(scopebuf, sizeof(scopebuf), "%c%u", |
| @@ -165,8 +166,7 @@ static int rpc_parse_scope_id(const char *buf, const size_t buflen, | |||
| 165 | if (*delim != IPV6_SCOPE_DELIMITER) | 166 | if (*delim != IPV6_SCOPE_DELIMITER) |
| 166 | return 0; | 167 | return 0; |
| 167 | 168 | ||
| 168 | if (!(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL) && | 169 | if (!(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL)) |
| 169 | !(ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_SITELOCAL)) | ||
| 170 | return 0; | 170 | return 0; |
| 171 | 171 | ||
| 172 | len = (buf + buflen) - delim - 1; | 172 | len = (buf + buflen) - delim - 1; |