From 1903ee63bcbb5da4abe567f07cff3683e6ffcd53 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Sun, 25 Jun 2006 23:53:47 -0700 Subject: [PATCH] --- yaml --- r: 30420 b: refs/heads/master c: 3ba07e65b288f00cc4d2420f1da46309b1cb5a0c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/discover.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bd6b03c183ee..8c60cf41f031 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65f51ef0971f01d64027cb3bca2c5827fb5b19cb +refs/heads/master: 3ba07e65b288f00cc4d2420f1da46309b1cb5a0c diff --git a/trunk/net/tipc/discover.c b/trunk/net/tipc/discover.c index ee9b4484d85c..2b8441203120 100644 --- a/trunk/net/tipc/discover.c +++ b/trunk/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;