From owner-svn-src-head@FreeBSD.ORG  Fri May  6 07:13:34 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FB33106566B;
	Fri,  6 May 2011 07:13:34 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 80AFA8FC0A;
	Fri,  6 May 2011 07:13:34 +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 p467DYjk037299;
	Fri, 6 May 2011 07:13:34 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p467DYmh037296;
	Fri, 6 May 2011 07:13:34 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201105060713.p467DYmh037296@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 6 May 2011 07:13:34 +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: r221521 - head/sys/netinet/ipfw
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2011 07:13:34 -0000

Author: ae
Date: Fri May  6 07:13:34 2011
New Revision: 221521
URL: http://svn.freebsd.org/changeset/base/221521

Log:
  Convert delay parameter back to ms when reporting to user.
  
  PR:		156838
  MFC after:	1 week

Modified:
  head/sys/netinet/ipfw/ip_dn_glue.c
  head/sys/netinet/ipfw/ip_dummynet.c

Modified: head/sys/netinet/ipfw/ip_dn_glue.c
==============================================================================
--- head/sys/netinet/ipfw/ip_dn_glue.c	Fri May  6 03:44:49 2011	(r221520)
+++ head/sys/netinet/ipfw/ip_dn_glue.c	Fri May  6 07:13:34 2011	(r221521)
@@ -624,7 +624,7 @@ dn_c_copy_pipe(struct dn_schk *s, struct
 	/* These 4 field are the same in pipe7 and pipe8 */
 	pipe7->next.sle_next = (struct dn_pipe7 *)DN_IS_PIPE;
 	pipe7->bandwidth = l->bandwidth;
-	pipe7->delay = l->delay;
+	pipe7->delay = l->delay * 1000 / hz;
 	pipe7->pipe_nr = l->link_nr - DN_MAX_ID;
 
 	if (!is7) {

Modified: head/sys/netinet/ipfw/ip_dummynet.c
==============================================================================
--- head/sys/netinet/ipfw/ip_dummynet.c	Fri May  6 03:44:49 2011	(r221520)
+++ head/sys/netinet/ipfw/ip_dummynet.c	Fri May  6 07:13:34 2011	(r221521)
@@ -808,6 +808,7 @@ copy_obj(char **start, char *end, void *
 		/* Adjust burst parameter for link */
 		struct dn_link *l = (struct dn_link *)*start;
 		l->burst =  div64(l->burst, 8 * hz);
+		l->delay = l->delay * 1000 / hz;
 	} else if (o->type == DN_SCH) {
 		/* Set id->id to the number of instances */
 		struct dn_schk *s = _o;