From 0cf4cee8f92443ceaae0012486befb8d1aae8b76 Mon Sep 17 00:00:00 2001 From: Mi Jinlong Date: Wed, 12 Oct 2011 15:09:34 +0800 Subject: [PATCH] --- yaml --- r: 267207 b: refs/heads/master c: b9dd3abbbc708da5e3c53424a5b2c66ab580f97e h: refs/heads/master i: 267205: d3c2dc99e6b3759d938c03f20397e656c69732e5 267203: e97fce4d73f92cc9406996cb98ee2f70fb357607 267199: 510bdd3ade342ca0e559c01f64a23e526dfdafac v: v3 --- [refs] | 2 +- trunk/fs/nfs/client.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 51ac79155acc..e8609fcb50b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3236c3e1adc0c7ec83eaff1de2d06746b7c5bb28 +refs/heads/master: b9dd3abbbc708da5e3c53424a5b2c66ab580f97e diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c index 5833fbbf59b0..b4e41dd4d0f6 100644 --- a/trunk/fs/nfs/client.c +++ b/trunk/fs/nfs/client.c @@ -336,11 +336,12 @@ static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1, const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sa1; const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sa2; - if (ipv6_addr_scope(&sin1->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL && - sin1->sin6_scope_id != sin2->sin6_scope_id) + if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr)) return 0; + else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL) + return sin1->sin6_scope_id == sin2->sin6_scope_id; - return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr); + return 1; } #else /* !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) */ static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1,