diff options
author | Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com> | 2016-04-21 09:51:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-24 14:35:07 -0400 |
commit | 8cee83dd29dea4e7d27fda3b170381059f628868 (patch) | |
tree | 3beb81a501e12e7baed9767bc01965ab1dcb3940 /net/tipc | |
parent | 6a74c1965ac8128da5feadccf739456c6586ad91 (diff) |
tipc: fix stale links after re-enabling bearer
Commit 42b18f605fea ("tipc: refactor function tipc_link_timeout()"),
introduced a bug which prevents sending of probe messages during
link synchronization phase. This leads to hanging links, if the
bearer is disabled/enabled after links are up.
In this commit, we send the probe messages correctly.
Fixes: 42b18f605fea ("tipc: refactor function tipc_link_timeout()")
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/link.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 2e28a7d7e802..7059c94f33c5 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -721,8 +721,7 @@ int tipc_link_timeout(struct tipc_link *l, struct sk_buff_head *xmitq) | |||
721 | mtyp = STATE_MSG; | 721 | mtyp = STATE_MSG; |
722 | state = bc_acked != bc_snt; | 722 | state = bc_acked != bc_snt; |
723 | probe = l->silent_intv_cnt; | 723 | probe = l->silent_intv_cnt; |
724 | if (probe) | 724 | l->silent_intv_cnt++; |
725 | l->silent_intv_cnt++; | ||
726 | break; | 725 | break; |
727 | case LINK_RESET: | 726 | case LINK_RESET: |
728 | setup = l->rst_cnt++ <= 4; | 727 | setup = l->rst_cnt++ <= 4; |