2 files changed, 4 insertions, 2 deletions

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 840db89e4283..3613e72e858e 100644
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -747,7 +747,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info)
                 return -EINVAL;
         }
 
-        bearer_disable(net, bearer, true);
+        bearer_disable(net, bearer, false);
         rtnl_unlock();
 
         return 0;
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 14f09b3cb87c..98609fdfb06a 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -344,6 +344,7 @@ void tipc_link_delete_list(struct net *net, unsigned int bearer_id,
         struct tipc_net *tn = net_generic(net, tipc_net_id);
         struct tipc_link *link;
         struct tipc_node *node;
+        bool del_link;
 
         rcu_read_lock();
         list_for_each_entry_rcu(node, &tn->node_list, list) {
@@ -353,12 +354,13 @@ void tipc_link_delete_list(struct net *net, unsigned int bearer_id,
                         tipc_node_unlock(node);
                         continue;
                 }
+                del_link = !tipc_link_is_up(link) && !link->exp_msg_count;
                 tipc_link_reset(link);
                 if (del_timer(&link->timer))
                         tipc_link_put(link);
                 link->flags |= LINK_STOPPED;
                 /* Delete link now, or when failover is finished: */
-                if (shutting_down || !tipc_node_is_up(node))
+                if (shutting_down || !tipc_node_is_up(node) || del_link)
                         tipc_link_delete(link);
                 tipc_node_unlock(node);
         }