Merge branch 'net-next-2.6-v6ready-20080703' of git://git.linux-ipv6.org/gitroot...

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

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index bf268b38696301cbfa7d3e43543acab578f28123..cfac26d674ede45d76fb199ce154297c7cf59609 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -197,7 +197,7 @@ static int ip6mr_vif_seq_show(struct seq_file *seq, void *v)
                const char *name = vif->dev ? vif->dev->name : "none";
 
                seq_printf(seq,
-                          "%2Zd %-10s %8ld %7ld  %8ld %7ld %05X\n",
+                          "%2td %-10s %8ld %7ld  %8ld %7ld %05X\n",
                           vif - vif6_table,
                           name, vif->bytes_in, vif->pkt_in,
                           vif->bytes_out, vif->pkt_out,
@@ -948,23 +948,51 @@ static struct notifier_block ip6_mr_notifier = {
  *     Setup for IP multicast routing
  */
 
-void __init ip6_mr_init(void)
+int __init ip6_mr_init(void)
 {
+       int err;
+
        mrt_cachep = kmem_cache_create("ip6_mrt_cache",
                                       sizeof(struct mfc6_cache),
                                       0, SLAB_HWCACHE_ALIGN,
                                       NULL);
        if (!mrt_cachep)
-               panic("cannot allocate ip6_mrt_cache");
+               return -ENOMEM;
 
        setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0);
-       register_netdevice_notifier(&ip6_mr_notifier);
+       err = register_netdevice_notifier(&ip6_mr_notifier);
+       if (err)
+               goto reg_notif_fail;
+#ifdef CONFIG_PROC_FS
+       err = -ENOMEM;
+       if (!proc_net_fops_create(&init_net, "ip6_mr_vif", 0, &ip6mr_vif_fops))
+               goto proc_vif_fail;
+       if (!proc_net_fops_create(&init_net, "ip6_mr_cache",
+                                    0, &ip6mr_mfc_fops))
+               goto proc_cache_fail;
+#endif
+       return 0;
+reg_notif_fail:
+       kmem_cache_destroy(mrt_cachep);
 #ifdef CONFIG_PROC_FS
-       proc_net_fops_create(&init_net, "ip6_mr_vif", 0, &ip6mr_vif_fops);
-       proc_net_fops_create(&init_net, "ip6_mr_cache", 0, &ip6mr_mfc_fops);
+proc_vif_fail:
+       unregister_netdevice_notifier(&ip6_mr_notifier);
+proc_cache_fail:
+       proc_net_remove(&init_net, "ip6_mr_vif");
 #endif
+       return err;
 }
 
+void ip6_mr_cleanup(void)
+{
+#ifdef CONFIG_PROC_FS
+       proc_net_remove(&init_net, "ip6_mr_cache");
+       proc_net_remove(&init_net, "ip6_mr_vif");
+#endif
+       unregister_netdevice_notifier(&ip6_mr_notifier);
+       del_timer(&ipmr_expire_timer);
+       kmem_cache_destroy(mrt_cachep);
+}
 
 static int ip6mr_mfc_add(struct mf6cctl *mfc, int mrtsock)
 {
@@ -1240,7 +1268,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, int
 
 #endif
        /*
-        *      Spurious command, or MRT_VERSION which you cannot
+        *      Spurious command, or MRT6_VERSION which you cannot
         *      set.
         */
        default: