summaryrefslogtreecommitdiff
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2013-06-17 18:54:41 +0400
committerDavid S. Miller <davem@davemloft.net>2013-06-18 02:53:00 +0400
commit7d0ab17b74330e39a68ba33099ccda27f794f519 (patch)
tree67eafce0b9ed65649be0407f800227001f3e5c54 /net/tipc/core.c
parent13a2e89873506d64d7e52f17b571da371a3e25a4 (diff)
downloadlinux-7d0ab17b74330e39a68ba33099ccda27f794f519.tar.xz
tipc: convert configuration server to use new server facility
As the new socket-based TIPC server infrastructure has been introduced, we can now convert the configuration server to use it. Then we can take future steps to simplify the configuration server locking policy. Some minor reordering of initialization is done, due to the dependency on having tipc_socket_init completed. Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/core.c')
-rw-r--r--net/tipc/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 15bbe99b609d..fd4eeeaa972a 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -137,8 +137,6 @@ static int tipc_core_start(void)
if (!res)
res = tipc_nametbl_init();
if (!res)
- res = tipc_cfg_init();
- if (!res)
res = tipc_netlink_start();
if (!res)
res = tipc_socket_init();
@@ -146,6 +144,8 @@ static int tipc_core_start(void)
res = tipc_register_sysctl();
if (!res)
res = tipc_subscr_start();
+ if (!res)
+ res = tipc_cfg_init();
if (res)
tipc_core_stop();