aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv6/af_inet6.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 6b509d7700de..050e14b7f701 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -795,15 +795,6 @@ static void ipv6_packet_cleanup(void)
795 dev_remove_pack(&ipv6_packet_type); 795 dev_remove_pack(&ipv6_packet_type);
796} 796}
797 797
798static int __init init_ipv6_mibs(void)
799{
800 return 0;
801}
802
803static void cleanup_ipv6_mibs(void)
804{
805}
806
807static int __net_init ipv6_init_mibs(struct net *net) 798static int __net_init ipv6_init_mibs(struct net *net)
808{ 799{
809 if (snmp_mib_init((void **)net->mib.udp_stats_in6, 800 if (snmp_mib_init((void **)net->mib.udp_stats_in6,
@@ -935,11 +926,6 @@ static int __init inet6_init(void)
935 if (err) 926 if (err)
936 goto out_sock_register_fail; 927 goto out_sock_register_fail;
937 928
938 /* Initialise ipv6 mibs */
939 err = init_ipv6_mibs();
940 if (err)
941 goto out_unregister_sock;
942
943#ifdef CONFIG_SYSCTL 929#ifdef CONFIG_SYSCTL
944 err = ipv6_static_sysctl_register(); 930 err = ipv6_static_sysctl_register();
945 if (err) 931 if (err)
@@ -1073,8 +1059,6 @@ register_pernet_fail:
1073 ipv6_static_sysctl_unregister(); 1059 ipv6_static_sysctl_unregister();
1074static_sysctl_fail: 1060static_sysctl_fail:
1075#endif 1061#endif
1076 cleanup_ipv6_mibs();
1077out_unregister_sock:
1078 sock_unregister(PF_INET6); 1062 sock_unregister(PF_INET6);
1079 rtnl_unregister_all(PF_INET6); 1063 rtnl_unregister_all(PF_INET6);
1080out_sock_register_fail: 1064out_sock_register_fail:
@@ -1131,7 +1115,6 @@ static void __exit inet6_exit(void)
1131#ifdef CONFIG_SYSCTL 1115#ifdef CONFIG_SYSCTL
1132 ipv6_static_sysctl_unregister(); 1116 ipv6_static_sysctl_unregister();
1133#endif 1117#endif
1134 cleanup_ipv6_mibs();
1135 proto_unregister(&rawv6_prot); 1118 proto_unregister(&rawv6_prot);
1136 proto_unregister(&udplitev6_prot); 1119 proto_unregister(&udplitev6_prot);
1137 proto_unregister(&udpv6_prot); 1120 proto_unregister(&udpv6_prot);