From owner-svn-src-stable@FreeBSD.ORG  Thu Mar  7 23:58:19 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 25E7C40E;
 Thu,  7 Mar 2013 23:58:19 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 002BFB9D;
 Thu,  7 Mar 2013 23:58:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27NwI8A062173;
 Thu, 7 Mar 2013 23:58:18 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27NwIZZ062172;
 Thu, 7 Mar 2013 23:58:18 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201303072358.r27NwIZZ062172@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 7 Mar 2013 23:58:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247982 - stable/8/sys/netinet
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Mar 2013 23:58:19 -0000

Author: tuexen
Date: Thu Mar  7 23:58:18 2013
New Revision: 247982
URL: http://svnweb.freebsd.org/changeset/base/247982

Log:
  MFC r240007:
  
  Fix a typo which results in RTT to be off by a factor of 10, if the RTT is
  larger than 1 second.

Modified:
  stable/8/sys/netinet/sctputil.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/netinet/sctputil.c
==============================================================================
--- stable/8/sys/netinet/sctputil.c	Thu Mar  7 23:55:42 2013	(r247981)
+++ stable/8/sys/netinet/sctputil.c	Thu Mar  7 23:58:18 2013	(r247982)
@@ -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 */