[Bluetooth] Store remote modem status for RFCOMM TTY

[pandora-kernel.git] / net / ipv6 / af_inet6.c

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index afe9276..e84b3fd 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -61,6 +61,9 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
+#ifdef CONFIG_IPV6_MROUTE
+#include <linux/mroute6.h>
+#endif
 
 MODULE_AUTHOR("Cast of dozens");
 MODULE_DESCRIPTION("IPv6 protocol stack for Linux");
@@ -188,7 +191,7 @@ lookup_protocol:
        np->mcast_hops  = -1;
        np->mc_loop     = 1;
        np->pmtudisc    = IPV6_PMTUDISC_WANT;
-       np->ipv6only    = init_net.ipv6.sysctl.bindv6only;
+       np->ipv6only    = net->ipv6.sysctl.bindv6only;
 
        /* Init the ipv4 part of the socket since we can have sockets
         * using v6 API for ipv4.
@@ -245,7 +248,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        struct sock *sk = sock->sk;
        struct inet_sock *inet = inet_sk(sk);
        struct ipv6_pinfo *np = inet6_sk(sk);
-       struct net *net = sk->sk_net;
+       struct net *net = sock_net(sk);
        __be32 v4addr = 0;
        unsigned short snum;
        int addr_type = 0;
@@ -438,7 +441,7 @@ EXPORT_SYMBOL(inet6_getname);
 int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
        struct sock *sk = sock->sk;
-       struct net *net = sk->sk_net;
+       struct net *net = sock_net(sk);
 
        switch(cmd)
        {
@@ -813,16 +816,12 @@ static int __init init_ipv6_mibs(void)
                goto err_icmpmsg_mib;
        if (snmp_mib_init((void **)udp_stats_in6, sizeof (struct udp_mib)) < 0)
                goto err_udp_mib;
-#ifdef CONFIG_IP_UDPLITE
        if (snmp_mib_init((void **)udplite_stats_in6,
                          sizeof (struct udp_mib)) < 0)
                goto err_udplite_mib;
-#endif
        return 0;
 
-#ifdef CONFIG_IP_UDPLITE
 err_udplite_mib:
-#endif
        snmp_mib_free((void **)udp_stats_in6);
 err_udp_mib:
        snmp_mib_free((void **)icmpv6msg_statistics);
@@ -841,13 +840,13 @@ static void cleanup_ipv6_mibs(void)
        snmp_mib_free((void **)icmpv6_statistics);
        snmp_mib_free((void **)icmpv6msg_statistics);
        snmp_mib_free((void **)udp_stats_in6);
-#ifdef CONFIG_IP_UDPLITE
        snmp_mib_free((void **)udplite_stats_in6);
-#endif
 }
 
 static int inet6_net_init(struct net *net)
 {
+       int err = 0;
+
        net->ipv6.sysctl.bindv6only = 0;
        net->ipv6.sysctl.flush_delay = 0;
        net->ipv6.sysctl.ip6_rt_max_size = 4096;
@@ -859,12 +858,36 @@ static int inet6_net_init(struct net *net)
        net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
        net->ipv6.sysctl.icmpv6_time = 1*HZ;
 
-       return 0;
+#ifdef CONFIG_PROC_FS
+       err = udp6_proc_init(net);
+       if (err)
+               goto out;
+       err = tcp6_proc_init(net);
+       if (err)
+               goto proc_tcp6_fail;
+       err = ac6_proc_init(net);
+       if (err)
+               goto proc_ac6_fail;
+out:
+#endif
+       return err;
+
+#ifdef CONFIG_PROC_FS
+proc_ac6_fail:
+       tcp6_proc_exit(net);
+proc_tcp6_fail:
+       udp6_proc_exit(net);
+       goto out;
+#endif
 }
 
 static void inet6_net_exit(struct net *net)
 {
-       return;
+#ifdef CONFIG_PROC_FS
+       udp6_proc_exit(net);
+       tcp6_proc_exit(net);
+       ac6_proc_exit(net);
+#endif
 }
 
 static struct pernet_operations inet6_net_ops = {
@@ -888,11 +911,9 @@ static int __init inet6_init(void)
        if (err)
                goto out_unregister_tcp_proto;
 
-#ifdef CONFIG_IP_UDPLITE
        err = proto_register(&udplitev6_prot, 1);
        if (err)
                goto out_unregister_udp_proto;
-#endif
 
        err = proto_register(&rawv6_prot, 1);
        if (err)
@@ -935,6 +956,9 @@ static int __init inet6_init(void)
        err = icmpv6_init();
        if (err)
                goto icmp_fail;
+#ifdef CONFIG_IPV6_MROUTE
+       ip6_mr_init();
+#endif
        err = ndisc_init();
        if (err)
                goto ndisc_fail;
@@ -949,17 +973,10 @@ static int __init inet6_init(void)
        err = -ENOMEM;
        if (raw6_proc_init())
                goto proc_raw6_fail;
-       if (tcp6_proc_init())
-               goto proc_tcp6_fail;
-       if (udp6_proc_init())
-               goto proc_udp6_fail;
        if (udplite6_proc_init())
                goto proc_udplite6_fail;
        if (ipv6_misc_proc_init())
                goto proc_misc6_fail;
-
-       if (ac6_proc_init())
-               goto proc_anycast6_fail;
        if (if6_proc_init())
                goto proc_if6_fail;
 #endif
@@ -1031,16 +1048,10 @@ ip6_route_fail:
 #ifdef CONFIG_PROC_FS
        if6_proc_exit();
 proc_if6_fail:
-       ac6_proc_exit();
-proc_anycast6_fail:
        ipv6_misc_proc_exit();
 proc_misc6_fail:
        udplite6_proc_exit();
 proc_udplite6_fail:
-       udp6_proc_exit();
-proc_udp6_fail:
-       tcp6_proc_exit();
-proc_tcp6_fail:
        raw6_proc_exit();
 proc_raw6_fail:
 #endif
@@ -1063,10 +1074,8 @@ out_sock_register_fail:
 out_unregister_raw_proto:
        proto_unregister(&rawv6_prot);
 out_unregister_udplite_proto:
-#ifdef CONFIG_IP_UDPLITE
        proto_unregister(&udplitev6_prot);
 out_unregister_udp_proto:
-#endif
        proto_unregister(&udpv6_prot);
 out_unregister_tcp_proto:
        proto_unregister(&tcpv6_prot);
@@ -1085,9 +1094,7 @@ static void __exit inet6_exit(void)
        ipv6_sysctl_unregister();
 #endif
        udpv6_exit();
-#ifdef CONFIG_IP_UDPLITE
        udplitev6_exit();
-#endif
        tcpv6_exit();
 
        /* Cleanup code parts. */
@@ -1101,11 +1108,8 @@ static void __exit inet6_exit(void)
 
        /* Cleanup code parts. */
        if6_proc_exit();
-       ac6_proc_exit();
        ipv6_misc_proc_exit();
        udplite6_proc_exit();
-       udp6_proc_exit();
-       tcp6_proc_exit();
        raw6_proc_exit();
 #endif
        ipv6_netfilter_fini();
@@ -1117,9 +1121,7 @@ static void __exit inet6_exit(void)
        unregister_pernet_subsys(&inet6_net_ops);
        cleanup_ipv6_mibs();
        proto_unregister(&rawv6_prot);
-#ifdef CONFIG_IP_UDPLITE
        proto_unregister(&udplitev6_prot);
-#endif
        proto_unregister(&udpv6_prot);
        proto_unregister(&tcpv6_prot);
 }