From owner-svn-src-all@FreeBSD.ORG  Wed Jun 15 21:58:01 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81747106566B;
	Wed, 15 Jun 2011 21:58:01 +0000 (UTC)
	(envelope-from rodrigc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 712588FC08;
	Wed, 15 Jun 2011 21:58:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5FLw1cV099769;
	Wed, 15 Jun 2011 21:58:01 GMT (envelope-from rodrigc@svn.freebsd.org)
Received: (from rodrigc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5FLw1oU099767;
	Wed, 15 Jun 2011 21:58:01 GMT (envelope-from rodrigc@svn.freebsd.org)
Message-Id: <201106152158.p5FLw1oU099767@svn.freebsd.org>
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Wed, 15 Jun 2011 21:58:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223121 - head/lib/libstand
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jun 2011 21:58:01 -0000

Author: rodrigc
Date: Wed Jun 15 21:58:01 2011
New Revision: 223121
URL: http://svn.freebsd.org/changeset/base/223121

Log:
  In sendrecv function, change the receive timeout  value between retries
  to increase in steps of MINTMO, instead of doubling the timeout for every
  retry.
  
  Obtained from: Juniper Networks
  Fixed by: Santhanakrishnan Balraj <sbalraj at juniper dot net>

Modified:
  head/lib/libstand/net.c

Modified: head/lib/libstand/net.c
==============================================================================
--- head/lib/libstand/net.c	Wed Jun 15 21:48:10 2011	(r223120)
+++ head/lib/libstand/net.c	Wed Jun 15 21:58:01 2011	(r223121)
@@ -100,7 +100,7 @@ sendrecv(struct iodesc *d,
 				    cc, ssize);
 
 			tleft = tmo;
-			tmo <<= 1;
+			tmo += MINTMO;
 			if (tmo > MAXTMO)
 				tmo = MAXTMO;