Commit 2de07f61 authored Oct 16, 2006 by Allan Stephens Committed by David S. Miller Oct 18, 2006

[TIPC]: Fixed slow link reactivation when link tolerance is large

This patch corrects an issue wherein a previouly failed node could
not reestablish a links to a non-failing node in the TIPC network
until the latter node detected the link failure itself (which might
be configured to take up to 30 seconds). The non-failing node now
responds to link setup requests from a previously failed node in at
most 1 second, allowing it to detect the link failure more quickly.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 08c31f71

net/tipc/discover.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -195,7 +195,8 @@ void tipc_disc_recv_msg(struct sk_buff *buf)
		struct sk_buff *rbuf;
		struct tipc_media_addr *addr;
		struct node *n_ptr = tipc_node_find(orig);
		int link_up;
		int link_fully_up;

		dbg(" in own cluster\n");
		if (n_ptr == NULL) {
		n_ptr = tipc_node_create(orig);
		@@ -225,9 +226,9 @@ void tipc_disc_recv_msg(struct sk_buff *buf)
		memcpy(addr, &media_addr, sizeof(*addr));
		tipc_link_reset(link);
		}
		link_up = tipc_link_is_up(link);
		link_fully_up = (link->state == WORKING_WORKING);
		spin_unlock_bh(&n_ptr->lock);
		if ((type == DSC_RESP_MSG) \|\| link_up)
		if ((type == DSC_RESP_MSG) \|\| link_fully_up)
		return;
		rbuf = tipc_disc_init_msg(DSC_RESP_MSG, 1, orig, b_ptr);
		if (rbuf != NULL) {

Admin message