[TIPC]: Fix incorrect correction to discovery timer frequency computation.
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>
This commit is contained in:
parent
65f51ef097
commit
3ba07e65b2
|
@ -2,7 +2,7 @@
|
||||||
* net/tipc/discover.c
|
* net/tipc/discover.c
|
||||||
*
|
*
|
||||||
* Copyright (c) 2003-2006, Ericsson AB
|
* Copyright (c) 2003-2006, Ericsson AB
|
||||||
* Copyright (c) 2005, Wind River Systems
|
* Copyright (c) 2005-2006, Wind River Systems
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -267,8 +267,8 @@ static void disc_timeout(struct link_req *req)
|
||||||
/* leave timer interval "as is" if already at a "normal" rate */
|
/* leave timer interval "as is" if already at a "normal" rate */
|
||||||
} else {
|
} else {
|
||||||
req->timer_intv *= 2;
|
req->timer_intv *= 2;
|
||||||
if (req->timer_intv > TIPC_LINK_REQ_SLOW)
|
if (req->timer_intv > TIPC_LINK_REQ_FAST)
|
||||||
req->timer_intv = TIPC_LINK_REQ_SLOW;
|
req->timer_intv = TIPC_LINK_REQ_FAST;
|
||||||
if ((req->timer_intv == TIPC_LINK_REQ_FAST) &&
|
if ((req->timer_intv == TIPC_LINK_REQ_FAST) &&
|
||||||
(req->bearer->nodes.count))
|
(req->bearer->nodes.count))
|
||||||
req->timer_intv = TIPC_LINK_REQ_SLOW;
|
req->timer_intv = TIPC_LINK_REQ_SLOW;
|
||||||
|
|
Loading…
Reference in New Issue