diff options
author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/tipc/cluster.c | |
parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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) |