diff options
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 20cddec0a43c..7756804034e2 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -1187,6 +1187,7 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb, | |||
1187 | if (msg_peer_node_is_up(hdr)) | 1187 | if (msg_peer_node_is_up(hdr)) |
1188 | return false; | 1188 | return false; |
1189 | tipc_node_fsm_evt(n, PEER_LOST_CONTACT_EVT); | 1189 | tipc_node_fsm_evt(n, PEER_LOST_CONTACT_EVT); |
1190 | return true; | ||
1190 | } | 1191 | } |
1191 | 1192 | ||
1192 | /* Ignore duplicate packets */ | 1193 | /* Ignore duplicate packets */ |
@@ -1232,12 +1233,10 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb, | |||
1232 | tipc_link_fsm_evt(l, LINK_SYNCH_BEGIN_EVT); | 1233 | tipc_link_fsm_evt(l, LINK_SYNCH_BEGIN_EVT); |
1233 | tipc_node_fsm_evt(n, NODE_SYNCH_BEGIN_EVT); | 1234 | tipc_node_fsm_evt(n, NODE_SYNCH_BEGIN_EVT); |
1234 | } | 1235 | } |
1235 | if (less(syncpt, n->sync_point)) | ||
1236 | n->sync_point = syncpt; | ||
1237 | } | 1236 | } |
1238 | 1237 | ||
1239 | /* Open tunnel link when parallel link reaches synch point */ | 1238 | /* Open tunnel link when parallel link reaches synch point */ |
1240 | if ((n->state == NODE_SYNCHING) && tipc_link_is_synching(l)) { | 1239 | if (n->state == NODE_SYNCHING) { |
1241 | if (tipc_link_is_synching(l)) { | 1240 | if (tipc_link_is_synching(l)) { |
1242 | tnl = l; | 1241 | tnl = l; |
1243 | } else { | 1242 | } else { |