diff options
| author |   Allan Stephens <allan.stephens@windriver.com> | 2006-06-25 23:52:50 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2006-06-25 23:52:50 -0700 |
| commit | 5392d646886d8f1ae01be69c10600b8df5284c41 (patch) | |
| tree | 38f6c38498dc7f1632cc04a50098b82037307e44 /net/tipc/node.c | |
| parent | [TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks. (diff) | |
| download | linux-dev-5392d646886d8f1ae01be69c10600b8df5284c41.tar.xz linux-dev-5392d646886d8f1ae01be69c10600b8df5284c41.zip | |
[TIPC]: Fixed link switchover bugs
Incorporates several related fixes:
- switchover now occurs when switching from an active link to a standby link
- failure of a standby link no longer initiates switchover
- links now display correct # of received packtes following reactivation
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/node.c')
| -rw-r--r-- | net/tipc/node.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 5f097547d3e3..ce9678efa98a 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -125,6 +125,8 @@ void tipc_node_link_up(struct node *n_ptr, struct link *l_ptr) { struct link **active = &n_ptr->active_links[0]; + n_ptr->working_links++; + info("Established link <%s> on network plane %c\n", l_ptr->name, l_ptr->b_ptr->net_plane); @@ -185,6 +187,8 @@ void tipc_node_link_down(struct node *n_ptr, struct link *l_ptr) { struct link **active; + n_ptr->working_links--; + if (!tipc_link_is_active(l_ptr)) { info("Lost standby link <%s> on network plane %c\n", l_ptr->name, l_ptr->b_ptr->net_plane); @@ -214,8 +218,7 @@ int tipc_node_has_active_links(struct node *n_ptr) int tipc_node_has_redundant_links(struct node *n_ptr) { - return (tipc_node_has_active_links(n_ptr) && - (n_ptr->active_links[0] != n_ptr->active_links[1])); + return (n_ptr->working_links > 1); } static int tipc_node_has_active_routes(struct node *n_ptr) |