diff options
Diffstat (limited to 'net/tipc/core.c')
-rw-r--r-- | net/tipc/core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index c6d3f75a9e1b..f9e88d8b04ca 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c | |||
@@ -82,8 +82,7 @@ struct sk_buff *tipc_buf_acquire(u32 size) | |||
82 | static void tipc_core_stop_net(void) | 82 | static void tipc_core_stop_net(void) |
83 | { | 83 | { |
84 | tipc_net_stop(); | 84 | tipc_net_stop(); |
85 | tipc_eth_media_stop(); | 85 | tipc_bearer_cleanup(); |
86 | tipc_ib_media_stop(); | ||
87 | } | 86 | } |
88 | 87 | ||
89 | /** | 88 | /** |
@@ -94,10 +93,7 @@ int tipc_core_start_net(unsigned long addr) | |||
94 | int res; | 93 | int res; |
95 | 94 | ||
96 | tipc_net_start(addr); | 95 | tipc_net_start(addr); |
97 | res = tipc_eth_media_start(); | 96 | res = tipc_bearer_setup(); |
98 | if (res < 0) | ||
99 | goto err; | ||
100 | res = tipc_ib_media_start(); | ||
101 | if (res < 0) | 97 | if (res < 0) |
102 | goto err; | 98 | goto err; |
103 | return res; | 99 | return res; |