2 files changed, 12 insertions, 3 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 7058c86f5e48..75db07c78a69 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1330,6 +1330,7 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
         u16 peers_snd_nxt =  msg_next_sent(hdr);
         u16 peers_tol = msg_link_tolerance(hdr);
         u16 peers_prio = msg_linkprio(hdr);
+        u16 rcv_nxt = l->rcv_nxt;
         char *if_name;
         int rc = 0;
 
@@ -1393,7 +1394,7 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
                         break;
 
                 /* Send NACK if peer has sent pkts we haven't received yet */
-                if (more(peers_snd_nxt, l->rcv_nxt))
+                if (more(peers_snd_nxt, rcv_nxt) && !tipc_link_is_synching(l))
                         rcvgap = peers_snd_nxt - l->rcv_nxt;
                 if (rcvgap || (msg_probe(hdr)))
                         tipc_link_build_proto_msg(l, STATE_MSG, 0, rcvgap,
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 937cc6192bcf..703875fd6cde 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -1079,7 +1079,7 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
         u16 exp_pkts = msg_msgcnt(hdr);
         u16 rcv_nxt, syncpt, dlv_nxt;
         int state = n->state;
-        struct tipc_link *l, *pl = NULL;
+        struct tipc_link *l, *tnl, *pl = NULL;
         struct tipc_media_addr *maddr;
         int i, pb_id;
 
@@ -1164,12 +1164,20 @@ static bool tipc_node_check_state(struct tipc_node *n, struct sk_buff *skb,
 
         /* Open tunnel link when parallel link reaches synch point */
         if ((n->state == NODE_SYNCHING) && tipc_link_is_synching(l)) {
+                if (tipc_link_is_synching(l)) {
+                        tnl = l;
+                } else {
+                        tnl = pl;
+                        pl = l;
+                }
                 dlv_nxt = pl->rcv_nxt - mod(skb_queue_len(pl->inputq));
                 if (more(dlv_nxt, n->sync_point)) {
-                        tipc_link_fsm_evt(l, LINK_SYNCH_END_EVT);
+                        tipc_link_fsm_evt(tnl, LINK_SYNCH_END_EVT);
                         tipc_node_fsm_evt(n, NODE_SYNCH_END_EVT);
                         return true;
                 }
+                if (l == pl)
+                        return true;
                 if ((usr == TUNNEL_PROTOCOL) && (mtyp == SYNCH_MSG))
                         return true;
                 if (usr == LINK_PROTOCOL)