diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 09:52:54 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 09:52:54 -0500 |
| commit | 7f50548abb5454bd82c25aae15f0a3bf6a530f46 (patch) | |
| tree | 175b5d695437151f0f9f778ad8eb7f274468842f /net/tipc/cluster.c | |
| parent | b3172f222ab5afdc91ea058bd11c42cf169728f3 (diff) | |
| parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
Merge commit 'v2.6.33-rc2' into for-2.6.33
Diffstat (limited to 'net/tipc/cluster.c')
| -rw-r--r-- | net/tipc/cluster.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c index 689fdefe9d04..a7eac00cd363 100644 --- a/net/tipc/cluster.c +++ b/net/tipc/cluster.c | |||
| @@ -437,11 +437,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf) | |||
| 437 | break; | 437 | break; |
| 438 | case ROUTE_ADDITION: | 438 | case ROUTE_ADDITION: |
| 439 | if (!is_slave(tipc_own_addr)) { | 439 | if (!is_slave(tipc_own_addr)) { |
| 440 | assert(!in_own_cluster(c_ptr->addr) | 440 | assert(!in_own_cluster(c_ptr->addr) || |
| 441 | || is_slave(rem_node)); | 441 | is_slave(rem_node)); |
| 442 | } else { | 442 | } else { |
| 443 | assert(in_own_cluster(c_ptr->addr) | 443 | assert(in_own_cluster(c_ptr->addr) && |
| 444 | && !is_slave(rem_node)); | 444 | !is_slave(rem_node)); |
| 445 | } | 445 | } |
| 446 | n_ptr = c_ptr->nodes[tipc_node(rem_node)]; | 446 | n_ptr = c_ptr->nodes[tipc_node(rem_node)]; |
| 447 | if (!n_ptr) | 447 | if (!n_ptr) |
| @@ -451,11 +451,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf) | |||
| 451 | break; | 451 | break; |
| 452 | case ROUTE_REMOVAL: | 452 | case ROUTE_REMOVAL: |
| 453 | if (!is_slave(tipc_own_addr)) { | 453 | if (!is_slave(tipc_own_addr)) { |
| 454 | assert(!in_own_cluster(c_ptr->addr) | 454 | assert(!in_own_cluster(c_ptr->addr) || |
| 455 | || is_slave(rem_node)); | 455 | is_slave(rem_node)); |
| 456 | } else { | 456 | } else { |
| 457 | assert(in_own_cluster(c_ptr->addr) | 457 | assert(in_own_cluster(c_ptr->addr) && |
| 458 | && !is_slave(rem_node)); | 458 | !is_slave(rem_node)); |
| 459 | } | 459 | } |
| 460 | n_ptr = c_ptr->nodes[tipc_node(rem_node)]; | 460 | n_ptr = c_ptr->nodes[tipc_node(rem_node)]; |
| 461 | if (n_ptr) | 461 | if (n_ptr) |