diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2006-06-26 02:53:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-26 02:53:47 -0400 |
commit | 3ba07e65b288f00cc4d2420f1da46309b1cb5a0c (patch) | |
tree | 204ae8a1c4be5fcb88d1d2740a0288a3b7b43b4f /net | |
parent | 65f51ef0971f01d64027cb3bca2c5827fb5b19cb (diff) |
[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')
-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 ee9b4484d85c..2b8441203120 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * net/tipc/discover.c | 2 | * net/tipc/discover.c |
3 | * | 3 | * |
4 | * Copyright (c) 2003-2006, Ericsson AB | 4 | * Copyright (c) 2003-2006, Ericsson AB |
5 | * Copyright (c) 2005, Wind River Systems | 5 | * Copyright (c) 2005-2006, Wind River Systems |
6 | * All rights reserved. | 6 | * All rights reserved. |
7 | * | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
@@ -267,8 +267,8 @@ static void disc_timeout(struct link_req *req) | |||
267 | /* leave timer interval "as is" if already at a "normal" rate */ | 267 | /* leave timer interval "as is" if already at a "normal" rate */ |
268 | } else { | 268 | } else { |
269 | req->timer_intv *= 2; | 269 | req->timer_intv *= 2; |
270 | if (req->timer_intv > TIPC_LINK_REQ_SLOW) | 270 | if (req->timer_intv > TIPC_LINK_REQ_FAST) |
271 | req->timer_intv = TIPC_LINK_REQ_SLOW; | 271 | req->timer_intv = TIPC_LINK_REQ_FAST; |
272 | if ((req->timer_intv == TIPC_LINK_REQ_FAST) && | 272 | if ((req->timer_intv == TIPC_LINK_REQ_FAST) && |
273 | (req->bearer->nodes.count)) | 273 | (req->bearer->nodes.count)) |
274 | req->timer_intv = TIPC_LINK_REQ_SLOW; | 274 | req->timer_intv = TIPC_LINK_REQ_SLOW; |