diff options
author | stephen hemminger <stephen@networkplumber.org> | 2014-01-04 16:49:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-04 20:18:50 -0500 |
commit | eec73f1c968d6d6cafa5ca19d53b6618bbd20e1e (patch) | |
tree | d7533f7a54cfa90c3a206a81419100e68ecdd4d7 /net/tipc | |
parent | 9805696399ac4e1a7f59ebccc614cbd5d7dace6d (diff) |
tipc: remove unused code
Remove dead code;
tipc_bearer_find_interface
tipc_node_redundant_links
This may break out of tree version of TIPC if there still is one.
But that maybe a good thing :-)
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/bearer.c | 19 | ||||
-rw-r--r-- | net/tipc/bearer.h | 1 | ||||
-rw-r--r-- | net/tipc/node.c | 5 | ||||
-rw-r--r-- | net/tipc/node.h | 1 |
4 files changed, 0 insertions, 26 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 3bb5f266b0eb..07ed5cc8235d 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c | |||
@@ -185,25 +185,6 @@ struct tipc_bearer *tipc_bearer_find(const char *name) | |||
185 | } | 185 | } |
186 | 186 | ||
187 | /** | 187 | /** |
188 | * tipc_bearer_find_interface - locates bearer object with matching interface name | ||
189 | */ | ||
190 | struct tipc_bearer *tipc_bearer_find_interface(const char *if_name) | ||
191 | { | ||
192 | struct tipc_bearer *b_ptr; | ||
193 | char *b_if_name; | ||
194 | u32 i; | ||
195 | |||
196 | for (i = 0, b_ptr = tipc_bearers; i < MAX_BEARERS; i++, b_ptr++) { | ||
197 | if (!b_ptr->active) | ||
198 | continue; | ||
199 | b_if_name = strchr(b_ptr->name, ':') + 1; | ||
200 | if (!strcmp(b_if_name, if_name)) | ||
201 | return b_ptr; | ||
202 | } | ||
203 | return NULL; | ||
204 | } | ||
205 | |||
206 | /** | ||
207 | * tipc_bearer_get_names - record names of bearers in buffer | 188 | * tipc_bearer_get_names - record names of bearers in buffer |
208 | */ | 189 | */ |
209 | struct sk_buff *tipc_bearer_get_names(void) | 190 | struct sk_buff *tipc_bearer_get_names(void) |
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index fa95c34ca926..410efb1e930b 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h | |||
@@ -190,7 +190,6 @@ struct sk_buff *tipc_bearer_get_names(void); | |||
190 | void tipc_bearer_add_dest(struct tipc_bearer *b_ptr, u32 dest); | 190 | void tipc_bearer_add_dest(struct tipc_bearer *b_ptr, u32 dest); |
191 | void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest); | 191 | void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest); |
192 | struct tipc_bearer *tipc_bearer_find(const char *name); | 192 | struct tipc_bearer *tipc_bearer_find(const char *name); |
193 | struct tipc_bearer *tipc_bearer_find_interface(const char *if_name); | ||
194 | struct tipc_media *tipc_media_find(const char *name); | 193 | struct tipc_media *tipc_media_find(const char *name); |
195 | int tipc_bearer_setup(void); | 194 | int tipc_bearer_setup(void); |
196 | void tipc_bearer_cleanup(void); | 195 | void tipc_bearer_cleanup(void); |
diff --git a/net/tipc/node.c b/net/tipc/node.c index bf1ac89b4806..e167d2615569 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -235,11 +235,6 @@ int tipc_node_active_links(struct tipc_node *n_ptr) | |||
235 | return n_ptr->active_links[0] != NULL; | 235 | return n_ptr->active_links[0] != NULL; |
236 | } | 236 | } |
237 | 237 | ||
238 | int tipc_node_redundant_links(struct tipc_node *n_ptr) | ||
239 | { | ||
240 | return n_ptr->working_links > 1; | ||
241 | } | ||
242 | |||
243 | int tipc_node_is_up(struct tipc_node *n_ptr) | 238 | int tipc_node_is_up(struct tipc_node *n_ptr) |
244 | { | 239 | { |
245 | return tipc_node_active_links(n_ptr); | 240 | return tipc_node_active_links(n_ptr); |
diff --git a/net/tipc/node.h b/net/tipc/node.h index e5e96c04e167..d4bb654c858d 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h | |||
@@ -115,7 +115,6 @@ void tipc_node_detach_link(struct tipc_node *n_ptr, struct tipc_link *l_ptr); | |||
115 | void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr); | 115 | void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr); |
116 | void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr); | 116 | void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr); |
117 | int tipc_node_active_links(struct tipc_node *n_ptr); | 117 | int tipc_node_active_links(struct tipc_node *n_ptr); |
118 | int tipc_node_redundant_links(struct tipc_node *n_ptr); | ||
119 | int tipc_node_is_up(struct tipc_node *n_ptr); | 118 | int tipc_node_is_up(struct tipc_node *n_ptr); |
120 | struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space); | 119 | struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space); |
121 | struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space); | 120 | struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space); |