From 46a2ed1814ad6d9a3cc5c2958ff23edb37149963 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Sun, 12 Sep 2010 19:55:26 -0400 Subject: [PATCH] --- yaml --- r: 210671 b: refs/heads/master c: b20d37ca9561711c6a3c4b859c2855f49565e061 h: refs/heads/master i: 210669: b9a0172bb2c69aefdca2b76dc6411987bfa7f2c7 210667: 9fbc43caaa082c76e2db3478d72119cc2c4f2f9c 210663: a88ae5e4a39425eb18fc67666e771f8e00b8ef3a 210655: ba94c6b58b20ce6dd843c6c324fb5b1d1e5bf334 v: v3 --- [refs] | 2 +- trunk/fs/nfs/client.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 857539c4ab0d..b487f6a15a9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db5fe26541b6b48460104a0d949a27cdc7786957 +refs/heads/master: b20d37ca9561711c6a3c4b859c2855f49565e061 diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c index 4e7df2adb212..e7340729af89 100644 --- a/trunk/fs/nfs/client.c +++ b/trunk/fs/nfs/client.c @@ -275,7 +275,7 @@ static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1, sin1->sin6_scope_id != sin2->sin6_scope_id) return 0; - return ipv6_addr_equal(&sin1->sin6_addr, &sin1->sin6_addr); + return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr); } #else /* !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) */ static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1,