[PATCH 4.14 19/69] Revert "tipc: fix modprobe tipc failed after switch order of device registration"

[Greg Kroah-Hartman]

From: David S. Miller <da...@davemloft.net>

commit 5593530e56943182ebb6d81eca8a3be6db6dbba4 upstream.

This reverts commit 532b0f7ece4cb2ffd24dc723ddf55242d1188e5e.

More revisions coming up.

Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 net/tipc/core.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -62,10 +62,6 @@ static int __net_init tipc_init_net(stru
        INIT_LIST_HEAD(&tn->node_list);
        spin_lock_init(&tn->node_list_lock);
 
-       err = tipc_socket_init();
-       if (err)
-               goto out_socket;
-
        err = tipc_sk_rht_init(net);
        if (err)
                goto out_sk_rht;
@@ -92,8 +88,6 @@ out_subscr:
 out_nametbl:
        tipc_sk_rht_destroy(net);
 out_sk_rht:
-       tipc_socket_stop();
-out_socket:
        return err;
 }
 
@@ -104,7 +98,6 @@ static void __net_exit tipc_exit_net(str
        tipc_bcast_stop(net);
        tipc_nametbl_stop(net);
        tipc_sk_rht_destroy(net);
-       tipc_socket_stop();
 }
 
 static struct pernet_operations tipc_net_ops = {
@@ -140,6 +133,10 @@ static int __init tipc_init(void)
        if (err)
                goto out_pernet;
 
+       err = tipc_socket_init();
+       if (err)
+               goto out_socket;
+
        err = tipc_bearer_setup();
        if (err)
                goto out_bearer;
@@ -147,6 +144,8 @@ static int __init tipc_init(void)
        pr_info("Started in single node mode\n");
        return 0;
 out_bearer:
+       tipc_socket_stop();
+out_socket:
        unregister_pernet_subsys(&tipc_net_ops);
 out_pernet:
        tipc_unregister_sysctl();
@@ -162,6 +161,7 @@ out_netlink:
 static void __exit tipc_exit(void)
 {
        tipc_bearer_cleanup();
+       tipc_socket_stop();
        unregister_pernet_subsys(&tipc_net_ops);
        tipc_netlink_stop();
        tipc_netlink_compat_stop();