Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

[linux-2.6-block.git] / net / tipc / cluster.c

diff --git a/net/tipc/cluster.c b/net/tipc/cluster.c
index 689fdefe9d04c58b7f20e2bc4b90b56ad1d60cce..a7eac00cd363298ff75e4fc57819ef66d8c41432 100644 (file)
--- a/net/tipc/cluster.c
+++ b/net/tipc/cluster.c
@@ -437,11 +437,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf)
                break;
        case ROUTE_ADDITION:
                if (!is_slave(tipc_own_addr)) {
-                       assert(!in_own_cluster(c_ptr->addr)
-                              || is_slave(rem_node));
+                       assert(!in_own_cluster(c_ptr->addr) ||
+                              is_slave(rem_node));
                } else {
-                       assert(in_own_cluster(c_ptr->addr)
-                              && !is_slave(rem_node));
+                       assert(in_own_cluster(c_ptr->addr) &&
+                              !is_slave(rem_node));
                }
                n_ptr = c_ptr->nodes[tipc_node(rem_node)];
                if (!n_ptr)
@@ -451,11 +451,11 @@ void tipc_cltr_recv_routing_table(struct sk_buff *buf)
                break;
        case ROUTE_REMOVAL:
                if (!is_slave(tipc_own_addr)) {
-                       assert(!in_own_cluster(c_ptr->addr)
-                              || is_slave(rem_node));
+                       assert(!in_own_cluster(c_ptr->addr) ||
+                              is_slave(rem_node));
                } else {
-                       assert(in_own_cluster(c_ptr->addr)
-                              && !is_slave(rem_node));
+                       assert(in_own_cluster(c_ptr->addr) &&
+                              !is_slave(rem_node));
                }
                n_ptr = c_ptr->nodes[tipc_node(rem_node)];
                if (n_ptr)