projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| b4b55a87 GKH |
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" | |
| 5 | ||
| 6 | From: David S. Miller <davem@davemloft.net> | |
| 7 | ||
| 8 | commit 5593530e56943182ebb6d81eca8a3be6db6dbba4 upstream. | |
| 9 | ||
| 10 | This reverts commit 532b0f7ece4cb2ffd24dc723ddf55242d1188e5e. | |
| 11 | ||
| 12 | More revisions coming up. | |
| 13 | ||
| 14 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 16 | ||
| 17 | --- | |
| 18 | net/tipc/core.c | 14 +++++++------- | |
| 19 | 1 file changed, 7 insertions(+), 7 deletions(-) | |
| 20 | ||
| 21 | --- a/net/tipc/core.c | |
| 22 | +++ b/net/tipc/core.c | |
| 23 | @@ -66,10 +66,6 @@ static int __net_init tipc_init_net(stru | |
| 24 | INIT_LIST_HEAD(&tn->node_list); | |
| 25 | spin_lock_init(&tn->node_list_lock); | |
| 26 | ||
| 27 | - err = tipc_socket_init(); | |
| 28 | - if (err) | |
| 29 | - goto out_socket; | |
| 30 | - | |
| 31 | err = tipc_sk_rht_init(net); | |
| 32 | if (err) | |
| 33 | goto out_sk_rht; | |
| 34 | @@ -96,8 +92,6 @@ out_subscr: | |
| 35 | out_nametbl: | |
| 36 | tipc_sk_rht_destroy(net); | |
| 37 | out_sk_rht: | |
| 38 | - tipc_socket_stop(); | |
| 39 | -out_socket: | |
| 40 | return err; | |
| 41 | } | |
| 42 | ||
| 43 | @@ -108,7 +102,6 @@ static void __net_exit tipc_exit_net(str | |
| 44 | tipc_bcast_stop(net); | |
| 45 | tipc_nametbl_stop(net); | |
| 46 | tipc_sk_rht_destroy(net); | |
| 47 | - tipc_socket_stop(); | |
| 48 | } | |
| 49 | ||
| 50 | static struct pernet_operations tipc_net_ops = { | |
| 51 | @@ -144,6 +137,10 @@ static int __init tipc_init(void) | |
| 52 | if (err) | |
| 53 | goto out_pernet; | |
| 54 | ||
| 55 | + err = tipc_socket_init(); | |
| 56 | + if (err) | |
| 57 | + goto out_socket; | |
| 58 | + | |
| 59 | err = tipc_bearer_setup(); | |
| 60 | if (err) | |
| 61 | goto out_bearer; | |
| 62 | @@ -151,6 +148,8 @@ static int __init tipc_init(void) | |
| 63 | pr_info("Started in single node mode\n"); | |
| 64 | return 0; | |
| 65 | out_bearer: | |
| 66 | + tipc_socket_stop(); | |
| 67 | +out_socket: | |
| 68 | unregister_pernet_subsys(&tipc_net_ops); | |
| 69 | out_pernet: | |
| 70 | tipc_unregister_sysctl(); | |
| 71 | @@ -166,6 +165,7 @@ out_netlink: | |
| 72 | static void __exit tipc_exit(void) | |
| 73 | { | |
| 74 | tipc_bearer_cleanup(); | |
| 75 | + tipc_socket_stop(); | |
| 76 | unregister_pernet_subsys(&tipc_net_ops); | |
| 77 | tipc_netlink_stop(); | |
| 78 | tipc_netlink_compat_stop(); |