| Message ID | 1461246673-6127-1-git-send-email-parthasarathy.bhuvaragan@ericsson.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com> Date: Thu, 21 Apr 2016 15:51:13 +0200 > 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> Please always group a "Fixes: " tag with the other tags. It is just another tag like Signed-off-by: and Acked-by: and therefore should be grouped together with them. Applied, thanks.
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) mtyp = STATE_MSG; state = bc_acked != bc_snt; probe = l->silent_intv_cnt; - if (probe) - l->silent_intv_cnt++; + l->silent_intv_cnt++; break; case LINK_RESET: setup = l->rst_cnt++ <= 4;
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> --- net/tipc/link.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)