|
@@ -938,14 +938,14 @@ static int __init inet6_init(void)
|
|
|
|
|
|
err = proto_register(&pingv6_prot, 1);
|
|
|
if (err)
|
|
|
- goto out_unregister_ping_proto;
|
|
|
+ goto out_unregister_raw_proto;
|
|
|
|
|
|
/* We MUST register RAW sockets before we create the ICMP6,
|
|
|
* IGMP6, or NDISC control sockets.
|
|
|
*/
|
|
|
err = rawv6_init();
|
|
|
if (err)
|
|
|
- goto out_unregister_raw_proto;
|
|
|
+ goto out_unregister_ping_proto;
|
|
|
|
|
|
/* Register the family here so that the init calls below will
|
|
|
* be able to create sockets. (?? is this dangerous ??)
|
|
@@ -1113,11 +1113,11 @@ netfilter_fail:
|
|
|
igmp_fail:
|
|
|
ndisc_cleanup();
|
|
|
ndisc_fail:
|
|
|
- ip6_mr_cleanup();
|
|
|
+ icmpv6_cleanup();
|
|
|
icmp_fail:
|
|
|
- unregister_pernet_subsys(&inet6_net_ops);
|
|
|
+ ip6_mr_cleanup();
|
|
|
ipmr_fail:
|
|
|
- icmpv6_cleanup();
|
|
|
+ unregister_pernet_subsys(&inet6_net_ops);
|
|
|
register_pernet_fail:
|
|
|
sock_unregister(PF_INET6);
|
|
|
rtnl_unregister_all(PF_INET6);
|