From owner-svn-src-all@FreeBSD.ORG  Thu Sep  6 18:31:57 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id F063F106564A;
	Thu,  6 Sep 2012 18:31:56 +0000 (UTC)
	(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DBB308FC08;
	Thu,  6 Sep 2012 18:31:56 +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 q86IVu7X065363;
	Thu, 6 Sep 2012 18:31:56 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q86IVu1M065361;
	Thu, 6 Sep 2012 18:31:56 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201209061831.q86IVu1M065361@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 6 Sep 2012 18:31:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240171 - releng/9.1/sys/netinet
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: Thu, 06 Sep 2012 18:31:57 -0000

Author: tuexen
Date: Thu Sep  6 18:31:56 2012
New Revision: 240171
URL: http://svn.freebsd.org/changeset/base/240171

Log:
  MFC rr240007:
  
  Fix a typo which results in RTT to be off by a factor of 10, if the RTT is
  larger than 1 second.
  
  Approved by:	re (kib)

Modified:
  releng/9.1/sys/netinet/sctputil.c
Directory Properties:
  releng/9.1/sys/   (props changed)

Modified: releng/9.1/sys/netinet/sctputil.c
==============================================================================
--- releng/9.1/sys/netinet/sctputil.c	Thu Sep  6 18:02:32 2012	(r240170)
+++ releng/9.1/sys/netinet/sctputil.c	Thu Sep  6 18:31:56 2012	(r240171)
@@ -2384,7 +2384,7 @@ sctp_calculate_rto(struct sctp_tcb *stcb
 	}
 	timevalsub(&now, old);
 	/* store the current RTT in us */
-	net->rtt = (uint64_t) 10000000 *(uint64_t) now.tv_sec +
+	net->rtt = (uint64_t) 1000000 *(uint64_t) now.tv_sec +
 	         (uint64_t) now.tv_usec;
 
 	/* computer rtt in ms */