From bfc26604a2572d16cb228b8a865f559e8b29c69f Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 5 Oct 2010 20:48:02 +0400 Subject: [PATCH] --- yaml --- r: 217260 b: refs/heads/master c: 70dc78da2cc76e7804c597fea3a0aff67ec8d7ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sunrpc/svcauth_unix.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6d202b35e6bc..9563d735d5d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e33534d54f1fde3e541f64fa5ad0dd379fc45fa7 +refs/heads/master: 70dc78da2cc76e7804c597fea3a0aff67ec8d7ad diff --git a/trunk/net/sunrpc/svcauth_unix.c b/trunk/net/sunrpc/svcauth_unix.c index 8b378f91f255..560677d187f1 100644 --- a/trunk/net/sunrpc/svcauth_unix.c +++ b/trunk/net/sunrpc/svcauth_unix.c @@ -220,10 +220,9 @@ static int ip_map_parse(struct cache_detail *cd, switch (address.sa.sa_family) { case AF_INET: /* Form a mapped IPv4 address in sin6 */ - memset(&sin6, 0, sizeof(sin6)); sin6.sin6_family = AF_INET6; - sin6.sin6_addr.s6_addr32[2] = htonl(0xffff); - sin6.sin6_addr.s6_addr32[3] = address.s4.sin_addr.s_addr; + ipv6_addr_set_v4mapped(address.s4.sin_addr.s_addr, + &sin6.sin6_addr); break; #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) case AF_INET6: