diff options
| author | Ying Xue <ying.xue@windriver.com> | 2014-05-05 08:56:16 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-05 17:26:45 -0400 |
| commit | eb8b00f5f248c50603bca383792ac3a618297be0 (patch) | |
| tree | 429c3bff534952209c848f011cb675530a115b5d /net/tipc/net.c | |
| parent | d69afc90b8d47e471d2870f090f662e569b08407 (diff) | |
| download | linux-eb8b00f5f248c50603bca383792ac3a618297be0.tar.gz linux-eb8b00f5f248c50603bca383792ac3a618297be0.tar.bz2 linux-eb8b00f5f248c50603bca383792ac3a618297be0.zip | |
tipc: convert allocations of global variables associated with bclink
Convert allocations of global variables associated with bclink from
static way to dynamical way for the convenience of bclink instance
initialisation. Meanwhile, this also helps TIPC support name space
in the future easily.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 75bb39025d53..f8fc95d58c0d 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -164,20 +164,25 @@ void tipc_net_route_msg(struct sk_buff *buf) tipc_link_xmit(buf, dnode, msg_link_selector(msg)); } -void tipc_net_start(u32 addr) +int tipc_net_start(u32 addr) { char addr_string[16]; + int res; tipc_own_addr = addr; tipc_named_reinit(); tipc_port_reinit(); - tipc_bclink_init(); + res = tipc_bclink_init(); + if (res) + return res; + tipc_nametbl_publish(TIPC_CFG_SRV, tipc_own_addr, tipc_own_addr, TIPC_ZONE_SCOPE, 0, tipc_own_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) |