diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /net/tipc/cluster.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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) |