Merge branch 'master' of git://1984.lsi.us.es/nf-next

[karo-tx-linux.git] / net / tipc / net.c

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 7c236c89cf5e5df849097333e155c5f2f6ad107e..7d305ecc09c2bf053376bb147c5cf917113022ae 100644 (file)
--- a/net/tipc/net.c
+++ b/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];
 
@@ -184,10 +184,9 @@ int tipc_net_start(u32 addr)
 
        tipc_cfg_reinit();
 
-       info("Started in network mode\n");
-       info("Own node address %s, network identity %u\n",
-            tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id);
-       return 0;
+       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);
 }
 
 void tipc_net_stop(void)
@@ -202,5 +201,5 @@ void tipc_net_stop(void)
        list_for_each_entry_safe(node, t_node, &tipc_node_list, list)
                tipc_node_delete(node);
        write_unlock_bh(&tipc_net_lock);
-       info("Left network mode\n");
+       pr_info("Left network mode\n");
 }