aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2006-10-16 21:57:13 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-10-18 19:55:20 -0700
commit2de07f6156fe664063207c010b3bd2500348884a (patch)
tree751cde2c24a190c6d02deaa75b72cbede9fb38ed /net/tipc
parent08c31f7167b1bdc30cd0960b45d6f3076eb1f179 (diff)
downloadkernel_samsung_smdk4412-2de07f6156fe664063207c010b3bd2500348884a.zip
kernel_samsung_smdk4412-2de07f6156fe664063207c010b3bd2500348884a.tar.gz
kernel_samsung_smdk4412-2de07f6156fe664063207c010b3bd2500348884a.tar.bz2
[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>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/discover.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index cc748d4..3b0cd12 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -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) {