Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / net / tipc / core.c

diff --git a/net/tipc/core.c b/net/tipc/core.c
index c6d3f75a9e1bba6f99cff5aed75d8e5a96f94484..f9e88d8b04ca182b2e8c217e579647fbf9581e4e 100644 (file)
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -82,8 +82,7 @@ struct sk_buff *tipc_buf_acquire(u32 size)
 static void tipc_core_stop_net(void)
 {
        tipc_net_stop();
-       tipc_eth_media_stop();
-       tipc_ib_media_stop();
+       tipc_bearer_cleanup();
 }
 
 /**
@@ -94,10 +93,7 @@ int tipc_core_start_net(unsigned long addr)
        int res;
 
        tipc_net_start(addr);
-       res = tipc_eth_media_start();
-       if (res < 0)
-               goto err;
-       res = tipc_ib_media_start();
+       res = tipc_bearer_setup();
        if (res < 0)
                goto err;
        return res;