Commit 379c0456 authored by Ying Xue's avatar Ying Xue Committed by David S. Miller

tipc: change tipc_net_start routine return value type

Since now tipc_net_start() always returns a success code - 0, its
return value type should be changed from integer to void, which can
avoid unnecessary check for its return value.
Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 38129433
...@@ -98,9 +98,8 @@ int tipc_core_start_net(unsigned long addr) ...@@ -98,9 +98,8 @@ int tipc_core_start_net(unsigned long addr)
{ {
int res; int res;
res = tipc_net_start(addr); tipc_net_start(addr);
if (!res) res = tipc_eth_media_start();
res = tipc_eth_media_start();
if (res) if (res)
tipc_core_stop_net(); tipc_core_stop_net();
return res; return res;
......
...@@ -171,7 +171,7 @@ void tipc_net_route_msg(struct sk_buff *buf) ...@@ -171,7 +171,7 @@ void tipc_net_route_msg(struct sk_buff *buf)
tipc_link_send(buf, dnode, msg_link_selector(msg)); tipc_link_send(buf, dnode, msg_link_selector(msg));
} }
int tipc_net_start(u32 addr) void tipc_net_start(u32 addr)
{ {
char addr_string[16]; char addr_string[16];
...@@ -187,7 +187,6 @@ int tipc_net_start(u32 addr) ...@@ -187,7 +187,6 @@ int tipc_net_start(u32 addr)
pr_info("Started in network mode\n"); pr_info("Started in network mode\n");
pr_info("Own node address %s, network identity %u\n", pr_info("Own node address %s, network identity %u\n",
tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id);
return 0;
} }
void tipc_net_stop(void) void tipc_net_stop(void)
......
...@@ -41,7 +41,7 @@ extern rwlock_t tipc_net_lock; ...@@ -41,7 +41,7 @@ extern rwlock_t tipc_net_lock;
void tipc_net_route_msg(struct sk_buff *buf); void tipc_net_route_msg(struct sk_buff *buf);
int tipc_net_start(u32 addr); void tipc_net_start(u32 addr);
void tipc_net_stop(void); void tipc_net_stop(void);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment