V4L/DVB (13946): proc_fops: convert av7110

[safe/jmp/linux-2.6] / net / sunrpc / svcauth_unix.c

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 97cc3de..d8c0411 100644 (file)
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -125,8 +125,8 @@ static int ip_map_match(struct cache_head *corig, struct cache_head *cnew)
 {
        struct ip_map *orig = container_of(corig, struct ip_map, h);
        struct ip_map *new = container_of(cnew, struct ip_map, h);
-       return strcmp(orig->m_class, new->m_class) == 0
-               && ipv6_addr_equal(&orig->m_addr, &new->m_addr);
+       return strcmp(orig->m_class, new->m_class) == 0 &&
+              ipv6_addr_equal(&orig->m_addr, &new->m_addr);
 }
 static void ip_map_init(struct cache_head *cnew, struct cache_head *citem)
 {
@@ -690,8 +690,7 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
        case AF_INET:
                sin = svc_addr_in(rqstp);
                sin6 = &sin6_storage;
-               ipv6_addr_set(&sin6->sin6_addr, 0, 0,
-                               htonl(0x0000FFFF), sin->sin_addr.s_addr);
+               ipv6_addr_set_v4mapped(sin->sin_addr.s_addr, &sin6->sin6_addr);
                break;
        case AF_INET6:
                sin6 = svc_addr_in6(rqstp);