diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2010-10-12 10:25:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-13 17:27:34 -0400 |
commit | 7368ddf144afd79456fd853fa25f33e31da003a9 (patch) | |
tree | e76770b74cbaa62da011742a07b6afe3545e4e08 /net/tipc/node.c | |
parent | 9fbb711ee1a70826440502133903d4df025c0b78 (diff) |
tipc: clean out all instances of #if 0'd unused code
Remove all instances of legacy, or as yet to be implemented code
that is currently living within an #if 0 ... #endif block.
In the rare instance that some of it be needed in the future,
it can still be dragged out of history, but there is no need
for it to sit in mainline.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 7c49cd056df7..823e9abb7ef5 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -125,16 +125,6 @@ void tipc_node_delete(struct tipc_node *n_ptr) | |||
125 | if (!n_ptr) | 125 | if (!n_ptr) |
126 | return; | 126 | return; |
127 | 127 | ||
128 | #if 0 | ||
129 | /* Not needed because links are already deleted via tipc_bearer_stop() */ | ||
130 | |||
131 | u32 l_num; | ||
132 | |||
133 | for (l_num = 0; l_num < MAX_BEARERS; l_num++) { | ||
134 | link_delete(n_ptr->links[l_num]); | ||
135 | } | ||
136 | #endif | ||
137 | |||
138 | dbg("node %x deleted\n", n_ptr->addr); | 128 | dbg("node %x deleted\n", n_ptr->addr); |
139 | kfree(n_ptr); | 129 | kfree(n_ptr); |
140 | } | 130 | } |
@@ -597,22 +587,6 @@ void tipc_node_remove_router(struct tipc_node *n_ptr, u32 router) | |||
597 | node_lost_contact(n_ptr); | 587 | node_lost_contact(n_ptr); |
598 | } | 588 | } |
599 | 589 | ||
600 | #if 0 | ||
601 | void node_print(struct print_buf *buf, struct tipc_node *n_ptr, char *str) | ||
602 | { | ||
603 | u32 i; | ||
604 | |||
605 | tipc_printf(buf, "\n\n%s", str); | ||
606 | for (i = 0; i < MAX_BEARERS; i++) { | ||
607 | if (!n_ptr->links[i]) | ||
608 | continue; | ||
609 | tipc_printf(buf, "Links[%u]: %x, ", i, n_ptr->links[i]); | ||
610 | } | ||
611 | tipc_printf(buf, "Active links: [%x,%x]\n", | ||
612 | n_ptr->active_links[0], n_ptr->active_links[1]); | ||
613 | } | ||
614 | #endif | ||
615 | |||
616 | u32 tipc_available_nodes(const u32 domain) | 590 | u32 tipc_available_nodes(const u32 domain) |
617 | { | 591 | { |
618 | struct tipc_node *n_ptr; | 592 | struct tipc_node *n_ptr; |