aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/link.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r--net/tipc/link.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index bb48b9685020..9fb0f6b96b45 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -438,8 +438,7 @@ void tipc_link_reset(struct tipc_link *l_ptr)
438 tipc_node_link_down(l_ptr->owner, l_ptr); 438 tipc_node_link_down(l_ptr->owner, l_ptr);
439 tipc_bearer_remove_dest(l_ptr->b_ptr, l_ptr->addr); 439 tipc_bearer_remove_dest(l_ptr->b_ptr, l_ptr->addr);
440 440
441 if (was_active_link && tipc_node_active_links(l_ptr->owner) && 441 if (was_active_link && tipc_node_active_links(l_ptr->owner)) {
442 l_ptr->owner->permit_changeover) {
443 l_ptr->reset_checkpoint = checkpoint; 442 l_ptr->reset_checkpoint = checkpoint;
444 l_ptr->exp_msg_count = START_CHANGEOVER; 443 l_ptr->exp_msg_count = START_CHANGEOVER;
445 } 444 }
@@ -1838,8 +1837,6 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf)
1838 if (tipc_own_addr > msg_prevnode(msg)) 1837 if (tipc_own_addr > msg_prevnode(msg))
1839 l_ptr->b_ptr->net_plane = msg_net_plane(msg); 1838 l_ptr->b_ptr->net_plane = msg_net_plane(msg);
1840 1839
1841 l_ptr->owner->permit_changeover = msg_redundant_link(msg);
1842
1843 switch (msg_type(msg)) { 1840 switch (msg_type(msg)) {
1844 1841
1845 case RESET_MSG: 1842 case RESET_MSG:
@@ -2001,11 +1998,6 @@ void tipc_link_failover_send_queue(struct tipc_link *l_ptr)
2001 if (!tunnel) 1998 if (!tunnel)
2002 return; 1999 return;
2003 2000
2004 if (!l_ptr->owner->permit_changeover) {
2005 pr_warn("%speer did not permit changeover\n", link_co_err);
2006 return;
2007 }
2008
2009 tipc_msg_init(&tunnel_hdr, CHANGEOVER_PROTOCOL, 2001 tipc_msg_init(&tunnel_hdr, CHANGEOVER_PROTOCOL,
2010 ORIGINAL_MSG, INT_H_SIZE, l_ptr->addr); 2002 ORIGINAL_MSG, INT_H_SIZE, l_ptr->addr);
2011 msg_set_bearer_id(&tunnel_hdr, l_ptr->peer_bearer_id); 2003 msg_set_bearer_id(&tunnel_hdr, l_ptr->peer_bearer_id);