diff options
author | Ying Xue <ying.xue@windriver.com> | 2011-08-08 22:45:27 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-09-17 22:55:15 -0400 |
commit | 94362c7e49b2eccf9fe86112b8090939aa2f5355 (patch) | |
tree | d6a1f0c92e880a30d367fd1f51448e4468918121 /net/tipc | |
parent | 7e2447763c28b8b67af67e757508c1a05c2c85b9 (diff) |
tipc: Remove unused link event tracking code
Elimintes prototype link event tracking functionality that has never
been fleshed out and doesn't do anything useful at the current time.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/config.h | 1 | ||||
-rw-r--r-- | net/tipc/link.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/net/tipc/config.h b/net/tipc/config.h index 443159a166fd..80da6ebc2785 100644 --- a/net/tipc/config.h +++ b/net/tipc/config.h | |||
@@ -65,7 +65,6 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, | |||
65 | const void *req_tlv_area, int req_tlv_space, | 65 | const void *req_tlv_area, int req_tlv_space, |
66 | int headroom); | 66 | int headroom); |
67 | 67 | ||
68 | void tipc_cfg_link_event(u32 addr, char *name, int up); | ||
69 | int tipc_cfg_init(void); | 68 | int tipc_cfg_init(void); |
70 | void tipc_cfg_stop(void); | 69 | void tipc_cfg_stop(void); |
71 | 70 | ||
diff --git a/net/tipc/link.c b/net/tipc/link.c index 2ea3f22b7986..ae98a72da11a 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -537,9 +537,6 @@ void tipc_link_stop(struct link *l_ptr) | |||
537 | l_ptr->proto_msg_queue = NULL; | 537 | l_ptr->proto_msg_queue = NULL; |
538 | } | 538 | } |
539 | 539 | ||
540 | /* LINK EVENT CODE IS NOT SUPPORTED AT PRESENT */ | ||
541 | #define link_send_event(fcn, l_ptr, up) do { } while (0) | ||
542 | |||
543 | void tipc_link_reset(struct link *l_ptr) | 540 | void tipc_link_reset(struct link *l_ptr) |
544 | { | 541 | { |
545 | struct sk_buff *buf; | 542 | struct sk_buff *buf; |
@@ -597,10 +594,6 @@ void tipc_link_reset(struct link *l_ptr) | |||
597 | l_ptr->fsm_msg_cnt = 0; | 594 | l_ptr->fsm_msg_cnt = 0; |
598 | l_ptr->stale_count = 0; | 595 | l_ptr->stale_count = 0; |
599 | link_reset_statistics(l_ptr); | 596 | link_reset_statistics(l_ptr); |
600 | |||
601 | link_send_event(tipc_cfg_link_event, l_ptr, 0); | ||
602 | if (!in_own_cluster(l_ptr->addr)) | ||
603 | link_send_event(tipc_disc_link_event, l_ptr, 0); | ||
604 | } | 597 | } |
605 | 598 | ||
606 | 599 | ||
@@ -609,9 +602,6 @@ static void link_activate(struct link *l_ptr) | |||
609 | l_ptr->next_in_no = l_ptr->stats.recv_info = 1; | 602 | l_ptr->next_in_no = l_ptr->stats.recv_info = 1; |
610 | tipc_node_link_up(l_ptr->owner, l_ptr); | 603 | tipc_node_link_up(l_ptr->owner, l_ptr); |
611 | tipc_bearer_add_dest(l_ptr->b_ptr, l_ptr->addr); | 604 | tipc_bearer_add_dest(l_ptr->b_ptr, l_ptr->addr); |
612 | link_send_event(tipc_cfg_link_event, l_ptr, 1); | ||
613 | if (!in_own_cluster(l_ptr->addr)) | ||
614 | link_send_event(tipc_disc_link_event, l_ptr, 1); | ||
615 | } | 605 | } |
616 | 606 | ||
617 | /** | 607 | /** |