[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 bddac0e8780f948f75b8de3d4fdb25e280080a2b..9869f87243cff4a55075d48b09aec55a17dd64de 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -752,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;
@@ -816,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();