diff options
| author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2015-08-20 02:12:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-23 16:14:45 -0700 |
| commit | 5ae2f8e6857968d6dddbd3879ed0a32b860e02d1 (patch) | |
| tree | e46e980ddb0ff5c3129981aa817e17c4a4006426 /net/tipc/link.c | |
| parent | 17b2063077a7478e5fd3c34b04a059dbb8474638 (diff) | |
| download | linux-5ae2f8e6857968d6dddbd3879ed0a32b860e02d1.tar.gz linux-5ae2f8e6857968d6dddbd3879ed0a32b860e02d1.tar.bz2 linux-5ae2f8e6857968d6dddbd3879ed0a32b860e02d1.zip | |
tipc: interrupt link synchronization when a link goes down
When we introduced the new link failover/synch mechanism
in commit 6e498158a827fd515b514842e9a06bdf0f75ab86
("tipc: move link synch and failover to link aggregation level"),
we missed the case when the non-tunnel link goes down during the link
synchronization period. In this case the tunnel link will remain in
state LINK_SYNCHING, something leading to unpredictable behavior when
the failover procedure is initiated.
In this commit, we ensure that the node and remaining link goes
back to regular communication state (SELF_UP_PEER_UP/LINK_ESTABLISHED)
when one of the parallel links goes down. We also ensure that we don't
re-enter synch mode if subsequent SYNCH packets arrive on the remaining
link.
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index f067e5425560..7058c86f5e48 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -351,11 +351,11 @@ int tipc_link_fsm_evt(struct tipc_link *l, int evt) l->state = LINK_RESET; break; case LINK_ESTABLISH_EVT: + case LINK_SYNCH_END_EVT: break; case LINK_SYNCH_BEGIN_EVT: l->state = LINK_SYNCHING; break; - case LINK_SYNCH_END_EVT: case LINK_FAILOVER_BEGIN_EVT: case LINK_FAILOVER_END_EVT: default: |