|
@@ -129,10 +129,6 @@ static int __init tipc_init(void)
|
|
|
if (err)
|
|
if (err)
|
|
|
goto out_netlink_compat;
|
|
goto out_netlink_compat;
|
|
|
|
|
|
|
|
- err = tipc_socket_init();
|
|
|
|
|
- if (err)
|
|
|
|
|
- goto out_socket;
|
|
|
|
|
-
|
|
|
|
|
err = tipc_register_sysctl();
|
|
err = tipc_register_sysctl();
|
|
|
if (err)
|
|
if (err)
|
|
|
goto out_sysctl;
|
|
goto out_sysctl;
|
|
@@ -141,6 +137,10 @@ static int __init tipc_init(void)
|
|
|
if (err)
|
|
if (err)
|
|
|
goto out_pernet;
|
|
goto out_pernet;
|
|
|
|
|
|
|
|
|
|
+ err = tipc_socket_init();
|
|
|
|
|
+ if (err)
|
|
|
|
|
+ goto out_socket;
|
|
|
|
|
+
|
|
|
err = tipc_bearer_setup();
|
|
err = tipc_bearer_setup();
|
|
|
if (err)
|
|
if (err)
|
|
|
goto out_bearer;
|
|
goto out_bearer;
|
|
@@ -148,12 +148,12 @@ static int __init tipc_init(void)
|
|
|
pr_info("Started in single node mode\n");
|
|
pr_info("Started in single node mode\n");
|
|
|
return 0;
|
|
return 0;
|
|
|
out_bearer:
|
|
out_bearer:
|
|
|
|
|
+ tipc_socket_stop();
|
|
|
|
|
+out_socket:
|
|
|
unregister_pernet_subsys(&tipc_net_ops);
|
|
unregister_pernet_subsys(&tipc_net_ops);
|
|
|
out_pernet:
|
|
out_pernet:
|
|
|
tipc_unregister_sysctl();
|
|
tipc_unregister_sysctl();
|
|
|
out_sysctl:
|
|
out_sysctl:
|
|
|
- tipc_socket_stop();
|
|
|
|
|
-out_socket:
|
|
|
|
|
tipc_netlink_compat_stop();
|
|
tipc_netlink_compat_stop();
|
|
|
out_netlink_compat:
|
|
out_netlink_compat:
|
|
|
tipc_netlink_stop();
|
|
tipc_netlink_stop();
|
|
@@ -165,10 +165,10 @@ out_netlink:
|
|
|
static void __exit tipc_exit(void)
|
|
static void __exit tipc_exit(void)
|
|
|
{
|
|
{
|
|
|
tipc_bearer_cleanup();
|
|
tipc_bearer_cleanup();
|
|
|
|
|
+ tipc_socket_stop();
|
|
|
unregister_pernet_subsys(&tipc_net_ops);
|
|
unregister_pernet_subsys(&tipc_net_ops);
|
|
|
tipc_netlink_stop();
|
|
tipc_netlink_stop();
|
|
|
tipc_netlink_compat_stop();
|
|
tipc_netlink_compat_stop();
|
|
|
- tipc_socket_stop();
|
|
|
|
|
tipc_unregister_sysctl();
|
|
tipc_unregister_sysctl();
|
|
|
|
|
|
|
|
pr_info("Deactivated\n");
|
|
pr_info("Deactivated\n");
|