aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-07-03 03:51:22 -0400
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-07-03 04:51:57 -0400
commite0835f8fa56d2d308486f8a34cf1c4480cd27f4e (patch)
tree8b9e2f60795dbc6e0e0138c8e7c362efecb568e8 /net/ipv6/af_inet6.c
parent03d2f897e9fb3218989baa2139a951ce7f5414bf (diff)
ipv4,ipv6 mroute: Add some helper inline functions to remove ugly ifdefs.
ip{,v6}_mroute_{set,get}sockopt() should not matter by optimization but it would be better not to depend on optimization semantically. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r--net/ipv6/af_inet6.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 6b39af1acb5e..3d828bc4b1cf 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -59,9 +59,7 @@
59 59
60#include <asm/uaccess.h> 60#include <asm/uaccess.h>
61#include <asm/system.h> 61#include <asm/system.h>
62#ifdef CONFIG_IPV6_MROUTE
63#include <linux/mroute6.h> 62#include <linux/mroute6.h>
64#endif
65 63
66MODULE_AUTHOR("Cast of dozens"); 64MODULE_AUTHOR("Cast of dozens");
67MODULE_DESCRIPTION("IPv6 protocol stack for Linux"); 65MODULE_DESCRIPTION("IPv6 protocol stack for Linux");
@@ -952,11 +950,9 @@ static int __init inet6_init(void)
952 err = icmpv6_init(); 950 err = icmpv6_init();
953 if (err) 951 if (err)
954 goto icmp_fail; 952 goto icmp_fail;
955#ifdef CONFIG_IPV6_MROUTE
956 err = ip6_mr_init(); 953 err = ip6_mr_init();
957 if (err) 954 if (err)
958 goto ipmr_fail; 955 goto ipmr_fail;
959#endif
960 err = ndisc_init(); 956 err = ndisc_init();
961 if (err) 957 if (err)
962 goto ndisc_fail; 958 goto ndisc_fail;
@@ -1059,10 +1055,8 @@ netfilter_fail:
1059igmp_fail: 1055igmp_fail:
1060 ndisc_cleanup(); 1056 ndisc_cleanup();
1061ndisc_fail: 1057ndisc_fail:
1062#ifdef CONFIG_IPV6_MROUTE
1063 ip6_mr_cleanup(); 1058 ip6_mr_cleanup();
1064ipmr_fail: 1059ipmr_fail:
1065#endif
1066 icmpv6_cleanup(); 1060 icmpv6_cleanup();
1067icmp_fail: 1061icmp_fail:
1068 unregister_pernet_subsys(&inet6_net_ops); 1062 unregister_pernet_subsys(&inet6_net_ops);
@@ -1117,9 +1111,7 @@ static void __exit inet6_exit(void)
1117 ipv6_netfilter_fini(); 1111 ipv6_netfilter_fini();
1118 igmp6_cleanup(); 1112 igmp6_cleanup();
1119 ndisc_cleanup(); 1113 ndisc_cleanup();
1120#ifdef CONFIG_IPV6_MROUTE
1121 ip6_mr_cleanup(); 1114 ip6_mr_cleanup();
1122#endif
1123 icmpv6_cleanup(); 1115 icmpv6_cleanup();
1124 rawv6_exit(); 1116 rawv6_exit();
1125 1117