diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2006-06-25 23:53:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-06-25 23:53:47 -0700 |
| commit | 3ba07e65b288f00cc4d2420f1da46309b1cb5a0c (patch) | |
| tree | 204ae8a1c4be5fcb88d1d2740a0288a3b7b43b4f /net/tipc | |
| parent | 65f51ef0971f01d64027cb3bca2c5827fb5b19cb (diff) | |
| download | kernel_samsung_aries-3ba07e65b288f00cc4d2420f1da46309b1cb5a0c.zip kernel_samsung_aries-3ba07e65b288f00cc4d2420f1da46309b1cb5a0c.tar.gz kernel_samsung_aries-3ba07e65b288f00cc4d2420f1da46309b1cb5a0c.tar.bz2 | |
[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>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/discover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index ee9b448..2b84412 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c @@ -2,7 +2,7 @@ * net/tipc/discover.c * * Copyright (c) 2003-2006, Ericsson AB - * Copyright (c) 2005, Wind River Systems + * Copyright (c) 2005-2006, Wind River Systems * All rights reserved. * * 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 */ } else { req->timer_intv *= 2; - if (req->timer_intv > TIPC_LINK_REQ_SLOW) - req->timer_intv = TIPC_LINK_REQ_SLOW; + if (req->timer_intv > TIPC_LINK_REQ_FAST) + req->timer_intv = TIPC_LINK_REQ_FAST; if ((req->timer_intv == TIPC_LINK_REQ_FAST) && (req->bearer->nodes.count)) req->timer_intv = TIPC_LINK_REQ_SLOW; |