net: spread __net_init, __net_exit

[safe/jmp/linux-2.6] / net / ipv6 / udp.c

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index f4c85b2..34efb35 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -89,7 +89,7 @@ static unsigned int udp6_portaddr_hash(struct net *net,
 
        if (ipv6_addr_any(addr6))
                hash = jhash_1word(0, mix);
-       else if (ipv6_addr_type(addr6) == IPV6_ADDR_MAPPED)
+       else if (ipv6_addr_v4mapped(addr6))
                hash = jhash_1word(addr6->s6_addr32[3], mix);
        else
                hash = jhash2(addr6->s6_addr32, 4, mix);
@@ -1396,7 +1396,7 @@ static struct udp_seq_afinfo udp6_seq_afinfo = {
        },
 };
 
-int udp6_proc_init(struct net *net)
+int __net_init udp6_proc_init(struct net *net)
 {
        return udp_proc_register(net, &udp6_seq_afinfo);
 }