[NETNS]: Make icmpv6_sk per namespace.

[linux-2.6] / net / ipv6 / af_inet6.c

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 3150c4be3c0cee7017504d8e58757749ad14c205..9869f87243cff4a55075d48b09aec55a17dd64de 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -72,8 +72,6 @@ MODULE_LICENSE("GPL");
 static struct list_head inetsw6[SOCK_MAX];
 static DEFINE_SPINLOCK(inetsw6_lock);
 
-void ipv6_frag_sysctl_init(struct net *net);
-
 static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)
 {
        const int offset = sk->sk_prot->obj_size - sizeof(struct ipv6_pinfo);
@@ -723,10 +721,6 @@ static void cleanup_ipv6_mibs(void)
 static int inet6_net_init(struct net *net)
 {
        net->ipv6.sysctl.bindv6only = 0;
-       net->ipv6.sysctl.frags.high_thresh = 256 * 1024;
-       net->ipv6.sysctl.frags.low_thresh = 192 * 1024;
-       net->ipv6.sysctl.frags.timeout = IPV6_FRAG_TIMEOUT;
-       net->ipv6.sysctl.frags.secret_interval = 10 * 60 * HZ;
        net->ipv6.sysctl.flush_delay = 0;
        net->ipv6.sysctl.ip6_rt_max_size = 4096;
        net->ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2;
@@ -736,7 +730,6 @@ static int inet6_net_init(struct net *net)
        net->ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ;
        net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
        net->ipv6.sysctl.icmpv6_time = 1*HZ;
-       ipv6_frag_sysctl_init(net);
 
        return 0;
 }
@@ -759,14 +752,6 @@ static int __init inet6_init(void)
 
        BUILD_BUG_ON(sizeof(struct inet6_skb_parm) > sizeof(dummy_skb->cb));
 
-#ifdef MODULE
-#if 0 /* FIXME --RR */
-       if (!mod_member_present(&__this_module, can_unload))
-         return -EINVAL;
-
-       __this_module.can_unload = &ipv6_unload;
-#endif
-#endif
        err = proto_register(&tcpv6_prot, 1);
        if (err)
                goto out;
@@ -823,13 +808,13 @@ static int __init inet6_init(void)
        if (err)
                goto sysctl_fail;
 #endif
-       err = icmpv6_init(&inet6_family_ops);
+       err = icmpv6_init();
        if (err)
                goto icmp_fail;
-       err = ndisc_init(&inet6_family_ops);
+       err = ndisc_init();
        if (err)
                goto ndisc_fail;
-       err = igmp6_init(&inet6_family_ops);
+       err = igmp6_init();
        if (err)
                goto igmp_fail;
        err = ipv6_netfilter_init();