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>

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();