ipv6: AF_INET6 link address family

[net-next-2.6.git] / net / tipc / node.c

diff --git a/net/tipc/node.c b/net/tipc/node.c
index 7c49cd056df73a725c5e3c9c3a9e8c2a6f800537..b4d87eb2dc5d871352d6d1f54ea73df830d83779 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -50,7 +50,8 @@ void node_print(struct print_buf *buf, struct tipc_node *n_ptr, char *str);
 static void node_lost_contact(struct tipc_node *n_ptr);
 static void node_established_contact(struct tipc_node *n_ptr);
 
-struct tipc_node *tipc_nodes = NULL;   /* sorted list of nodes within cluster */
+/* sorted list of nodes within cluster */
+static struct tipc_node *tipc_nodes = NULL;
 
 static DEFINE_SPINLOCK(node_create_lock);
 
@@ -125,16 +126,6 @@ void tipc_node_delete(struct tipc_node *n_ptr)
        if (!n_ptr)
                return;
 
-#if 0
-       /* Not needed because links are already deleted via tipc_bearer_stop() */
-
-       u32 l_num;
-
-       for (l_num = 0; l_num < MAX_BEARERS; l_num++) {
-               link_delete(n_ptr->links[l_num]);
-       }
-#endif
-
        dbg("node %x deleted\n", n_ptr->addr);
        kfree(n_ptr);
 }
@@ -597,38 +588,6 @@ void tipc_node_remove_router(struct tipc_node *n_ptr, u32 router)
                node_lost_contact(n_ptr);
 }
 
-#if 0
-void node_print(struct print_buf *buf, struct tipc_node *n_ptr, char *str)
-{
-       u32 i;
-
-       tipc_printf(buf, "\n\n%s", str);
-       for (i = 0; i < MAX_BEARERS; i++) {
-               if (!n_ptr->links[i])
-                       continue;
-               tipc_printf(buf, "Links[%u]: %x, ", i, n_ptr->links[i]);
-       }
-       tipc_printf(buf, "Active links: [%x,%x]\n",
-                   n_ptr->active_links[0], n_ptr->active_links[1]);
-}
-#endif
-
-u32 tipc_available_nodes(const u32 domain)
-{
-       struct tipc_node *n_ptr;
-       u32 cnt = 0;
-
-       read_lock_bh(&tipc_net_lock);
-       for (n_ptr = tipc_nodes; n_ptr; n_ptr = n_ptr->next) {
-               if (!tipc_in_scope(domain, n_ptr->addr))
-                       continue;
-               if (tipc_node_is_up(n_ptr))
-                       cnt++;
-       }
-       read_unlock_bh(&tipc_net_lock);
-       return cnt;
-}
-
 struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
 {
        u32 domain;