2 files changed, 5 insertions, 1 deletions

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 3e41704832de..5ee5076a8b27 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -215,7 +215,11 @@ void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked)
         struct net *net = n_ptr->net;
         struct tipc_net *tn = net_generic(net, tipc_net_id);
 
+        if (unlikely(!n_ptr->bclink.recv_permitted))
+                return;
+
         tipc_bclink_lock(net);
+
         /* Bail out if tx queue is empty (no clean up is required) */
         skb = skb_peek(&tn->bcl->outqueue);
         if (!skb)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 56c39b1a53a9..2652c3286e2f 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1117,7 +1117,7 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b_ptr)
                 ackd = msg_ack(msg);
 
                 /* Release acked messages */
-                if (likely(n_ptr->bclink.recv_permitted))
+                if (unlikely(n_ptr->bclink.acked != msg_bcast_ack(msg)))
                         tipc_bclink_acknowledge(n_ptr, msg_bcast_ack(msg));
 
                 released = 0;