Merge tag 'dmaengine-4.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[deliverable/linux.git] / net / tipc / core.c

diff --git a/net/tipc/core.c b/net/tipc/core.c
index be1c9fa60b09dc713155c94e7bf6bcc6366fc7aa..005ba5eb0ea426a3a24cbfe0e74aa4c1901af903 100644 (file)
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -68,7 +68,7 @@ static int __net_init tipc_init_net(struct net *net)
        if (err)
                goto out_nametbl;
 
-       err = tipc_subscr_start(net);
+       err = tipc_topsrv_start(net);
        if (err)
                goto out_subscr;
        return 0;
@@ -83,7 +83,7 @@ out_sk_rht:
 
 static void __net_exit tipc_exit_net(struct net *net)
 {
-       tipc_subscr_stop(net);
+       tipc_topsrv_stop(net);
        tipc_net_stop(net);
        tipc_nametbl_stop(net);
        tipc_sk_rht_destroy(net);