From 2e3644ae974ff9354c87873915584049c41bf321 Mon Sep 17 00:00:00 2001 From: Ying Xue Date: Mon, 8 Aug 2011 22:45:27 -0400 Subject: [PATCH] --- yaml --- r: 266123 b: refs/heads/master c: 94362c7e49b2eccf9fe86112b8090939aa2f5355 h: refs/heads/master i: 266121: b91d91d058c6d1922dc3966bf6fbd93c9b691093 266119: d4f5d2e4b0c77f6a853204a2159a8abcf34ce6ca v: v3 --- [refs] | 2 +- trunk/net/tipc/config.h | 1 - trunk/net/tipc/link.c | 10 ---------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 0556f8b88cae..f600c3e5ec1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e2447763c28b8b67af67e757508c1a05c2c85b9 +refs/heads/master: 94362c7e49b2eccf9fe86112b8090939aa2f5355 diff --git a/trunk/net/tipc/config.h b/trunk/net/tipc/config.h index 443159a166fd..80da6ebc2785 100644 --- a/trunk/net/tipc/config.h +++ b/trunk/net/tipc/config.h @@ -65,7 +65,6 @@ struct sk_buff *tipc_cfg_do_cmd(u32 orig_node, u16 cmd, const void *req_tlv_area, int req_tlv_space, int headroom); -void tipc_cfg_link_event(u32 addr, char *name, int up); int tipc_cfg_init(void); void tipc_cfg_stop(void); diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c index 2ea3f22b7986..ae98a72da11a 100644 --- a/trunk/net/tipc/link.c +++ b/trunk/net/tipc/link.c @@ -537,9 +537,6 @@ void tipc_link_stop(struct link *l_ptr) l_ptr->proto_msg_queue = NULL; } -/* LINK EVENT CODE IS NOT SUPPORTED AT PRESENT */ -#define link_send_event(fcn, l_ptr, up) do { } while (0) - void tipc_link_reset(struct link *l_ptr) { struct sk_buff *buf; @@ -597,10 +594,6 @@ void tipc_link_reset(struct link *l_ptr) l_ptr->fsm_msg_cnt = 0; l_ptr->stale_count = 0; link_reset_statistics(l_ptr); - - link_send_event(tipc_cfg_link_event, l_ptr, 0); - if (!in_own_cluster(l_ptr->addr)) - link_send_event(tipc_disc_link_event, l_ptr, 0); } @@ -609,9 +602,6 @@ static void link_activate(struct link *l_ptr) l_ptr->next_in_no = l_ptr->stats.recv_info = 1; tipc_node_link_up(l_ptr->owner, l_ptr); tipc_bearer_add_dest(l_ptr->b_ptr, l_ptr->addr); - link_send_event(tipc_cfg_link_event, l_ptr, 1); - if (!in_own_cluster(l_ptr->addr)) - link_send_event(tipc_disc_link_event, l_ptr, 1); } /**