1 From 5593530e56943182ebb6d81eca8a3be6db6dbba4 Mon Sep 17 00:00:00 2001
2 From: "David S. Miller" <davem@davemloft.net>
3 Date: Fri, 17 May 2019 12:15:05 -0700
4 Subject: Revert "tipc: fix modprobe tipc failed after switch order of device registration"
6 From: David S. Miller <davem@davemloft.net>
8 commit 5593530e56943182ebb6d81eca8a3be6db6dbba4 upstream.
10 This reverts commit 532b0f7ece4cb2ffd24dc723ddf55242d1188e5e.
12 More revisions coming up.
14 Signed-off-by: David S. Miller <davem@davemloft.net>
15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
18 net/tipc/core.c | 14 +++++++-------
19 1 file changed, 7 insertions(+), 7 deletions(-)
23 @@ -61,10 +61,6 @@ static int __net_init tipc_init_net(stru
24 INIT_LIST_HEAD(&tn->node_list);
25 spin_lock_init(&tn->node_list_lock);
27 - err = tipc_socket_init();
31 err = tipc_sk_rht_init(net);
34 @@ -91,8 +87,6 @@ out_subscr:
36 tipc_sk_rht_destroy(net);
43 @@ -103,7 +97,6 @@ static void __net_exit tipc_exit_net(str
45 tipc_nametbl_stop(net);
46 tipc_sk_rht_destroy(net);
50 static struct pernet_operations tipc_net_ops = {
51 @@ -141,6 +134,10 @@ static int __init tipc_init(void)
55 + err = tipc_socket_init();
59 err = tipc_bearer_setup();
62 @@ -148,6 +145,8 @@ static int __init tipc_init(void)
63 pr_info("Started in single node mode\n");
68 unregister_pernet_subsys(&tipc_net_ops);
70 tipc_unregister_sysctl();
71 @@ -163,6 +162,7 @@ out_netlink:
72 static void __exit tipc_exit(void)
74 tipc_bearer_cleanup();
76 unregister_pernet_subsys(&tipc_net_ops);
78 tipc_netlink_compat_stop();