1 files changed, 44 insertions, 1 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index b1f0bee54eac..fb886b525d95 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -410,6 +410,11 @@ char *tipc_link_name(struct tipc_link *l)
         return l->name;
 }
 
+u32 tipc_link_state(struct tipc_link *l)
+{
+        return l->state;
+}
+
 /**
  * tipc_link_create - create a new link
  * @n: pointer to associated node
@@ -841,9 +846,14 @@ void tipc_link_reset(struct tipc_link *l)
         l->in_session = false;
         l->session++;
         l->mtu = l->advertised_mtu;
+        spin_lock_bh(&l->wakeupq.lock);
+        spin_lock_bh(&l->inputq->lock);
+        skb_queue_splice_init(&l->wakeupq, l->inputq);
+        spin_unlock_bh(&l->inputq->lock);
+        spin_unlock_bh(&l->wakeupq.lock);
+
         __skb_queue_purge(&l->transmq);
         __skb_queue_purge(&l->deferdq);
-        skb_queue_splice_init(&l->wakeupq, l->inputq);
         __skb_queue_purge(&l->backlogq);
         l->backlog[TIPC_LOW_IMPORTANCE].len = 0;
         l->backlog[TIPC_MEDIUM_IMPORTANCE].len = 0;
@@ -1380,6 +1390,36 @@ static void tipc_link_build_proto_msg(struct tipc_link *l, int mtyp, bool probe,
         __skb_queue_tail(xmitq, skb);
 }
 
+void tipc_link_create_dummy_tnl_msg(struct tipc_link *l,
+                                    struct sk_buff_head *xmitq)
+{
+        u32 onode = tipc_own_addr(l->net);
+        struct tipc_msg *hdr, *ihdr;
+        struct sk_buff_head tnlq;
+        struct sk_buff *skb;
+        u32 dnode = l->addr;
+
+        skb_queue_head_init(&tnlq);
+        skb = tipc_msg_create(TUNNEL_PROTOCOL, FAILOVER_MSG,
+                              INT_H_SIZE, BASIC_H_SIZE,
+                              dnode, onode, 0, 0, 0);
+        if (!skb) {
+                pr_warn("%sunable to create tunnel packet\n", link_co_err);
+                return;
+        }
+
+        hdr = buf_msg(skb);
+        msg_set_msgcnt(hdr, 1);
+        msg_set_bearer_id(hdr, l->peer_bearer_id);
+
+        ihdr = (struct tipc_msg *)msg_data(hdr);
+        tipc_msg_init(onode, ihdr, TIPC_LOW_IMPORTANCE, TIPC_DIRECT_MSG,
+                      BASIC_H_SIZE, dnode);
+        msg_set_errcode(ihdr, TIPC_ERR_NO_PORT);
+        __skb_queue_tail(&tnlq, skb);
+        tipc_link_xmit(l, &tnlq, xmitq);
+}
+
 /* tipc_link_tnl_prepare(): prepare and return a list of tunnel packets
  * with contents of the link's transmit and backlog queues.
  */
@@ -1476,6 +1516,9 @@ bool tipc_link_validate_msg(struct tipc_link *l, struct tipc_msg *hdr)
                         return false;
                 if (session != curr_session)
                         return false;
+                /* Extra sanity check */
+                if (!link_is_up(l) && msg_ack(hdr))
+                        return false;
                 if (!(l->peer_caps & TIPC_LINK_PROTO_SEQNO))
                         return true;
                 /* Accept only STATE with new sequence number */