diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2010-10-05 20:48:02 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-11 20:00:17 -0400 |
| commit | 70dc78da2cc76e7804c597fea3a0aff67ec8d7ad (patch) | |
| tree | 2a547a8457b27a8efd9fe56488dd7ef73e81de6b /net | |
| parent | e33534d54f1fde3e541f64fa5ad0dd379fc45fa7 (diff) | |
| download | linux-stable-70dc78da2cc76e7804c597fea3a0aff67ec8d7ad.tar.gz linux-stable-70dc78da2cc76e7804c597fea3a0aff67ec8d7ad.tar.bz2 linux-stable-70dc78da2cc76e7804c597fea3a0aff67ec8d7ad.zip | |
sunrpc: Use helper to set v4 mapped addr in ip_map_parse
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/svcauth_unix.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index 8b378f91f255..560677d187f1 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/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: |