diff options
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index fafef6c3c0f6..61afee7e8291 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
| @@ -174,7 +174,6 @@ void tipc_net_route_msg(struct sk_buff *buf) | |||
| 174 | int tipc_net_start(u32 addr) | 174 | int tipc_net_start(u32 addr) |
| 175 | { | 175 | { |
| 176 | char addr_string[16]; | 176 | char addr_string[16]; |
| 177 | int res; | ||
| 178 | 177 | ||
| 179 | if (tipc_mode != TIPC_NODE_MODE) | 178 | if (tipc_mode != TIPC_NODE_MODE) |
| 180 | return -ENOPROTOOPT; | 179 | return -ENOPROTOOPT; |
| @@ -187,9 +186,7 @@ int tipc_net_start(u32 addr) | |||
| 187 | tipc_named_reinit(); | 186 | tipc_named_reinit(); |
| 188 | tipc_port_reinit(); | 187 | tipc_port_reinit(); |
| 189 | 188 | ||
| 190 | res = tipc_bclink_init(); | 189 | tipc_bclink_init(); |
| 191 | if (res) | ||
| 192 | return res; | ||
| 193 | 190 | ||
| 194 | tipc_k_signal((Handler)tipc_subscr_start, 0); | 191 | tipc_k_signal((Handler)tipc_subscr_start, 0); |
| 195 | tipc_k_signal((Handler)tipc_cfg_init, 0); | 192 | tipc_k_signal((Handler)tipc_cfg_init, 0); |
| @@ -207,8 +204,8 @@ void tipc_net_stop(void) | |||
| 207 | if (tipc_mode != TIPC_NET_MODE) | 204 | if (tipc_mode != TIPC_NET_MODE) |
| 208 | return; | 205 | return; |
| 209 | write_lock_bh(&tipc_net_lock); | 206 | write_lock_bh(&tipc_net_lock); |
| 210 | tipc_bearer_stop(); | ||
| 211 | tipc_mode = TIPC_NODE_MODE; | 207 | tipc_mode = TIPC_NODE_MODE; |
| 208 | tipc_bearer_stop(); | ||
| 212 | tipc_bclink_stop(); | 209 | tipc_bclink_stop(); |
| 213 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list) | 210 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list) |
| 214 | tipc_node_delete(node); | 211 | tipc_node_delete(node); |
