1 files changed, 6 insertions, 6 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 1287161e9424..514466efc25c 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -854,6 +854,7 @@ int tipc_link_xmit(struct net *net, struct sk_buff_head *list, u32 dnode,
                 if (link)
                         rc = __tipc_link_xmit(net, link, list);
                 tipc_node_unlock(node);
+                tipc_node_put(node);
         }
         if (link)
                 return rc;
@@ -980,7 +981,6 @@ static void link_retransmit_failure(struct tipc_link *l_ptr,
                         (unsigned long) TIPC_SKB_CB(buf)->handle);
 
                 n_ptr = tipc_bclink_retransmit_to(net);
-                tipc_node_lock(n_ptr);
 
                 tipc_addr_string_fill(addr_string, n_ptr->addr);
                 pr_info("Broadcast link info for %s\n", addr_string);
@@ -992,9 +992,7 @@ static void link_retransmit_failure(struct tipc_link *l_ptr,
                         n_ptr->bclink.oos_state,
                         n_ptr->bclink.last_sent);
 
-                tipc_node_unlock(n_ptr);
-
-                tipc_bclink_set_flags(net, TIPC_BCLINK_RESET);
+                n_ptr->action_flags |= TIPC_BCAST_RESET;
                 l_ptr->stale_count = 0;
         }
 }
@@ -1119,8 +1117,8 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b_ptr)
                 n_ptr = tipc_node_find(net, msg_prevnode(msg));
                 if (unlikely(!n_ptr))
                         goto discard;
-                tipc_node_lock(n_ptr);
 
+                tipc_node_lock(n_ptr);
                 /* Locate unicast link endpoint that should handle message */
                 l_ptr = n_ptr->links[b_ptr->identity];
                 if (unlikely(!l_ptr))
@@ -1208,6 +1206,7 @@ void tipc_rcv(struct net *net, struct sk_buff *skb, struct tipc_bearer *b_ptr)
                 skb = NULL;
 unlock:
                 tipc_node_unlock(n_ptr);
+                tipc_node_put(n_ptr);
 discard:
                 if (unlikely(skb))
                         kfree_skb(skb);
@@ -2239,7 +2238,6 @@ int tipc_nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb)
         msg.seq = cb->nlh->nlmsg_seq;
 
         rcu_read_lock();
-
         if (prev_node) {
                 node = tipc_node_find(net, prev_node);
                 if (!node) {
@@ -2252,6 +2250,7 @@ int tipc_nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb)
                         cb->prev_seq = 1;
                         goto out;
                 }
+                tipc_node_put(node);
 
                 list_for_each_entry_continue_rcu(node, &tn->node_list,
                                                  list) {
@@ -2259,6 +2258,7 @@ int tipc_nl_link_dump(struct sk_buff *skb, struct netlink_callback *cb)
                         err = __tipc_nl_add_node_links(net, &msg, node,
                                                        &prev_link);
                         tipc_node_unlock(node);
+                        tipc_node_put(node);
                         if (err)
                                 goto out;