diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2006-06-25 23:51:37 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-25 23:51:37 -0700 |
commit | f131072c3da84e70a0f65d71b3a3f6611c6a22bc (patch) | |
tree | 6b00e151ee25a9d20fc56c4aa5f947561a65047d /net/tipc/node.c | |
parent | e100ae92a68c55e7ba287866c20fe1b0ad4fcdee (diff) | |
download | kernel_samsung_tuna-f131072c3da84e70a0f65d71b3a3f6611c6a22bc.zip kernel_samsung_tuna-f131072c3da84e70a0f65d71b3a3f6611c6a22bc.tar.gz kernel_samsung_tuna-f131072c3da84e70a0f65d71b3a3f6611c6a22bc.tar.bz2 |
[TIPC]: First phase of assert() cleanup
This also contains enhancements to simplify comparisons in name table
publication removal algorithm and to simplify name table sanity checking
when shutting down TIPC.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 0d5db06..b54462b 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -234,7 +234,6 @@ struct node *tipc_node_attach_link(struct link *l_ptr) u32 bearer_id = l_ptr->b_ptr->identity; char addr_string[16]; - assert(bearer_id < MAX_BEARERS); if (n_ptr->link_cnt >= 2) { char addr_string[16]; @@ -314,7 +313,7 @@ static void node_established_contact(struct node *n_ptr) struct cluster *c_ptr; dbg("node_established_contact:-> %x\n", n_ptr->addr); - if (!tipc_node_has_active_routes(n_ptr)) { + if (!tipc_node_has_active_routes(n_ptr) && in_own_cluster(n_ptr->addr)) { tipc_k_signal((Handler)tipc_named_node_up, n_ptr->addr); } |