diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2008-05-21 14:55:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-21 14:55:04 -0700 |
| commit | 03194379a77b02df3404ec4848a50c6784e9a8a5 (patch) | |
| tree | f76ddd4c02f71f5ed03da0729d563f81d701f267 /net/tipc/net.c | |
| parent | 6d4a6672c8263f98544d2b91690dc7074b144090 (diff) | |
| download | kernel-crypto-03194379a77b02df3404ec4848a50c6784e9a8a5.tar.gz kernel-crypto-03194379a77b02df3404ec4848a50c6784e9a8a5.tar.xz kernel-crypto-03194379a77b02df3404ec4848a50c6784e9a8a5.zip | |
tipc: Fix initialization sequence problems when entering network mode
This patch ensures that TIPC's topology service and configuration
service are shut down before switching into "network mode". This
ensures that TIPC does not mistakenly try to send unnecessary
"publication withdraw" messages to other nodes before it is fully
initialized for sending off-node messages. Note that the node's
current network address is now updated only after the two services
are shut down; this ensures that any existing connections to the
topology server are terminated correctly using the old address.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index c39c76201e8..cc51fa48367 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -266,7 +266,7 @@ void tipc_net_route_msg(struct sk_buff *buf) tipc_link_send(buf, dnode, msg_link_selector(msg)); } -int tipc_net_start(void) +int tipc_net_start(u32 addr) { char addr_string[16]; int res; @@ -274,6 +274,10 @@ int tipc_net_start(void) if (tipc_mode != TIPC_NODE_MODE) return -ENOPROTOOPT; + tipc_subscr_stop(); + tipc_cfg_stop(); + + tipc_own_addr = addr; tipc_mode = TIPC_NET_MODE; tipc_named_reinit(); tipc_port_reinit(); @@ -284,10 +288,10 @@ int tipc_net_start(void) (res = tipc_bclink_init())) { return res; } - tipc_subscr_stop(); - tipc_cfg_stop(); + tipc_k_signal((Handler)tipc_subscr_start, 0); tipc_k_signal((Handler)tipc_cfg_init, 0); + info("Started in network mode\n"); info("Own node address %s, network identity %u\n", addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); |