tipc: make name table distributor use new send function

In a previous commit series ("tipc: new unicast transmission code")
we introduced a new message sending function, tipc_link_xmit2(),
and moved the unicast data users over to use that function. We now
let the internal name table distributor do the same.

The interaction between the name distributor and the node/link
layer also becomes significantly simpler, so we can eliminate
the function tipc_link_names_xmit().

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 41 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index a235b245f682..367b0f5886f8 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1033,47 +1033,6 @@ static void tipc_link_sync_rcv(struct tipc_node *n, struct sk_buff *buf)
 }
 
 /*
- * tipc_link_names_xmit - send name table entries to new neighbor
- *
- * Send routine for bulk delivery of name table messages when contact
- * with a new neighbor occurs. No link congestion checking is performed
- * because name table messages *must* be delivered. The messages must be
- * small enough not to require fragmentation.
- * Called without any locks held.
- */
-void tipc_link_names_xmit(struct list_head *message_list, u32 dest)
-{
-        struct tipc_node *n_ptr;
-        struct tipc_link *l_ptr;
-        struct sk_buff *buf;
-        struct sk_buff *temp_buf;
-
-        if (list_empty(message_list))
-                return;
-
-        n_ptr = tipc_node_find(dest);
-        if (n_ptr) {
-                tipc_node_lock(n_ptr);
-                l_ptr = n_ptr->active_links[0];
-                if (l_ptr) {
-                        /* convert circular list to linear list */
-                        ((struct sk_buff *)message_list->prev)->next = NULL;
-                        link_add_chain_to_outqueue(l_ptr,
-                                (struct sk_buff *)message_list->next, 0);
-                        tipc_link_push_queue(l_ptr);
-                        INIT_LIST_HEAD(message_list);
-                }
-                tipc_node_unlock(n_ptr);
-        }
-
-        /* discard the messages if they couldn't be sent */
-        list_for_each_safe(buf, temp_buf, ((struct sk_buff *)message_list)) {
-                list_del((struct list_head *)buf);
-                kfree_skb(buf);
-        }
-}
-
-/*
  * tipc_link_push_packet: Push one unsent packet to the media
  */
 static u32 tipc_link_push_packet(struct tipc_link *l_ptr)