From 352ad09528eecf8eb9799609ebfcca976270d54a Mon Sep 17 00:00:00 2001
From: Ying Xue <ying.xue@windriver.com>
Date: Thu, 16 Aug 2012 12:09:10 +0000
Subject: [PATCH] --- yaml --- r: 327550 b: refs/heads/master c:
 379c0456afc170d56ceb712a5689ede91d293e88 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/core.c | 5 ++---
 trunk/net/tipc/net.c  | 3 +--
 trunk/net/tipc/net.h  | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d6eef8aa8bc1..18960e01ba8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 381294331ed2858f8e75223310f873d580921366
+refs/heads/master: 379c0456afc170d56ceb712a5689ede91d293e88
diff --git a/trunk/net/tipc/core.c b/trunk/net/tipc/core.c
index c261a5dca7c5..daae7f74d418 100644
--- a/trunk/net/tipc/core.c
+++ b/trunk/net/tipc/core.c
@@ -98,9 +98,8 @@ int tipc_core_start_net(unsigned long addr)
 {
 	int res;
 
-	res = tipc_net_start(addr);
-	if (!res)
-		res = tipc_eth_media_start();
+	tipc_net_start(addr);
+	res = tipc_eth_media_start();
 	if (res)
 		tipc_core_stop_net();
 	return res;
diff --git a/trunk/net/tipc/net.c b/trunk/net/tipc/net.c
index 5b5cea259caf..7d305ecc09c2 100644
--- a/trunk/net/tipc/net.c
+++ b/trunk/net/tipc/net.c
@@ -171,7 +171,7 @@ void tipc_net_route_msg(struct sk_buff *buf)
 	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];
 
@@ -187,7 +187,6 @@ int tipc_net_start(u32 addr)
 	pr_info("Started in network mode\n");
 	pr_info("Own node address %s, network identity %u\n",
 		tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id);
-	return 0;
 }
 
 void tipc_net_stop(void)
diff --git a/trunk/net/tipc/net.h b/trunk/net/tipc/net.h
index 9eb4b9e220eb..079daadb3f72 100644
--- a/trunk/net/tipc/net.h
+++ b/trunk/net/tipc/net.h
@@ -41,7 +41,7 @@ extern rwlock_t tipc_net_lock;
 
 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);
 
 #endif