diff options
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r-- | net/tipc/link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index d4f2780ff871..d8a4b90b029c 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -548,7 +548,7 @@ void tipc_link_reset(struct link *l_ptr) | |||
548 | tipc_node_link_down(l_ptr->owner, l_ptr); | 548 | tipc_node_link_down(l_ptr->owner, l_ptr); |
549 | tipc_bearer_remove_dest(l_ptr->b_ptr, l_ptr->addr); | 549 | tipc_bearer_remove_dest(l_ptr->b_ptr, l_ptr->addr); |
550 | 550 | ||
551 | if (was_active_link && tipc_node_has_active_links(l_ptr->owner) && | 551 | if (was_active_link && tipc_node_active_links(l_ptr->owner) && |
552 | l_ptr->owner->permit_changeover) { | 552 | l_ptr->owner->permit_changeover) { |
553 | l_ptr->reset_checkpoint = checkpoint; | 553 | l_ptr->reset_checkpoint = checkpoint; |
554 | l_ptr->exp_msg_count = START_CHANGEOVER; | 554 | l_ptr->exp_msg_count = START_CHANGEOVER; |
@@ -1954,7 +1954,7 @@ void tipc_link_send_proto_msg(struct link *l_ptr, u32 msg_typ, int probe_msg, | |||
1954 | msg_set_max_pkt(msg, l_ptr->max_pkt_target); | 1954 | msg_set_max_pkt(msg, l_ptr->max_pkt_target); |
1955 | } | 1955 | } |
1956 | 1956 | ||
1957 | if (tipc_node_has_redundant_links(l_ptr->owner)) | 1957 | if (tipc_node_redundant_links(l_ptr->owner)) |
1958 | msg_set_redundant_link(msg); | 1958 | msg_set_redundant_link(msg); |
1959 | else | 1959 | else |
1960 | msg_clear_redundant_link(msg); | 1960 | msg_clear_redundant_link(msg); |
@@ -2064,7 +2064,7 @@ static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf) | |||
2064 | l_ptr->peer_bearer_id = msg_bearer_id(msg); | 2064 | l_ptr->peer_bearer_id = msg_bearer_id(msg); |
2065 | 2065 | ||
2066 | /* Synchronize broadcast sequence numbers */ | 2066 | /* Synchronize broadcast sequence numbers */ |
2067 | if (!tipc_node_has_redundant_links(l_ptr->owner)) | 2067 | if (!tipc_node_redundant_links(l_ptr->owner)) |
2068 | l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg)); | 2068 | l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg)); |
2069 | break; | 2069 | break; |
2070 | case STATE_MSG: | 2070 | case STATE_MSG: |