istallion: Use helpers

[linux-2.6-omap-h63xx.git] / net / ipv6 / af_inet6.c

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 6b39af1acb5e373b2e91f79ee670ab09b95b34e2..3d828bc4b1cf97cbfcbd1df9e76c5b357b37a9c4 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -59,9 +59,7 @@
 
 #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");
@@ -952,11 +950,9 @@ static int __init inet6_init(void)
        err = icmpv6_init();
        if (err)
                goto icmp_fail;
-#ifdef CONFIG_IPV6_MROUTE
        err = ip6_mr_init();
        if (err)
                goto ipmr_fail;
-#endif
        err = ndisc_init();
        if (err)
                goto ndisc_fail;
@@ -1059,10 +1055,8 @@ netfilter_fail:
 igmp_fail:
        ndisc_cleanup();
 ndisc_fail:
-#ifdef CONFIG_IPV6_MROUTE
        ip6_mr_cleanup();
 ipmr_fail:
-#endif
        icmpv6_cleanup();
 icmp_fail:
        unregister_pernet_subsys(&inet6_net_ops);
@@ -1117,9 +1111,7 @@ static void __exit inet6_exit(void)
        ipv6_netfilter_fini();
        igmp6_cleanup();
        ndisc_cleanup();
-#ifdef CONFIG_IPV6_MROUTE
        ip6_mr_cleanup();
-#endif
        icmpv6_cleanup();
        rawv6_exit();