OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tipc: change tipc_net_start routine return value type

Browse Source 
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: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue 2012-08-16 12:09:10 +00:00 committed by David S. Miller
parent 381294331e
commit 379c0456af
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/tipc/core.c
View File

@ -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;

3
net/tipc/net.c
View File

@ -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)
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)

2
net/tipc/net.h
View File

@ -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