[TIPC]: First phase of assert() cleanup

[linux-2.6] / net / tipc / node.c

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 0d5db06e203f59a4da46b8a8182e86c7f5e462a7..b54462bd98d7242a05615a6d7d5e290e9db997b2 100644 (file)
--- 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);
        }