From owner-svn-src-stable@FreeBSD.ORG  Tue Oct 28 06:17:26 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F0ECF3A1;
 Tue, 28 Oct 2014 06:17:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D35937DF;
 Tue, 28 Oct 2014 06:17:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9S6HP8H050485;
 Tue, 28 Oct 2014 06:17:25 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9S6HPrH050484;
 Tue, 28 Oct 2014 06:17:25 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201410280617.s9S6HPrH050484@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 28 Oct 2014 06:17:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r273765 - stable/10/cddl/lib/libdtrace
X-SVN-Group: stable-10
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.18-1
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: Tue, 28 Oct 2014 06:17:26 -0000

Author: markj
Date: Tue Oct 28 06:17:25 2014
New Revision: 273765
URL: https://svnweb.freebsd.org/changeset/base/273765

Log:
  MFC r273370:
  Correct the calculation of tcps_rto in the struct tcpcb -> tcpsinfo_t
  translator.

Modified:
  stable/10/cddl/lib/libdtrace/tcp.d
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/lib/libdtrace/tcp.d
==============================================================================
--- stable/10/cddl/lib/libdtrace/tcp.d	Tue Oct 28 04:59:33 2014	(r273764)
+++ stable/10/cddl/lib/libdtrace/tcp.d	Tue Oct 28 06:17:25 2014	(r273765)
@@ -197,7 +197,7 @@ translator tcpsinfo_t < struct tcpcb *p 
 	tcps_cwnd_ssthresh =	p == NULL ? -1  : p->snd_ssthresh;
 	tcps_sack_fack =	p == NULL ? 0  : p->snd_fack;
 	tcps_sack_snxt =	p == NULL ? 0  : p->sack_newdata;
-	tcps_rto =		p == NULL ? -1  : p->t_rxtcur / 1000; /* XXX */
+	tcps_rto =		p == NULL ? -1 : (p->t_rxtcur * 1000) / `hz;
 	tcps_mss =		p == NULL ? -1  : p->t_maxseg;
 	tcps_retransmit =	p == NULL ? -1 : p->t_rxtshift > 0 ? 1 : 0;
 };