1 files changed, 10 insertions, 4 deletions

diff --git a/net/tipc/node.c b/net/tipc/node.c
index efe4d41bf11b..0b0f6c7da965 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -162,7 +162,7 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
                 pr_info("New link <%s> becomes standby\n", l_ptr->name);
                 return;
         }
-        tipc_link_dup_send_queue(active[0], l_ptr);
+        tipc_link_dup_queue_xmit(active[0], l_ptr);
         if (l_ptr->priority == active[0]->priority) {
                 active[0] = l_ptr;
                 return;
@@ -249,9 +249,15 @@ void tipc_node_attach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
 
 void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
 {
-        n_ptr->links[l_ptr->b_ptr->identity] = NULL;
-        atomic_dec(&tipc_num_links);
-        n_ptr->link_cnt--;
+        int i;
+
+        for (i = 0; i < MAX_BEARERS; i++) {
+                if (l_ptr != n_ptr->links[i])
+                        continue;
+                n_ptr->links[i] = NULL;
+                atomic_dec(&tipc_num_links);
+                n_ptr->link_cnt--;
+        }
 }
 
 static void node_established_contact(struct tipc_node *n_ptr)