Commit 3ba07e65 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

[TIPC]: Fix incorrect correction to discovery timer frequency computation. 



Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPer Liden <per.liden@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65f51ef0

net/tipc/discover.c

+3 −3
Original line number Diff line number Diff line
@@ -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;