From owner-freebsd-ipfw@FreeBSD.ORG  Fri May  6 07:20:11 2011
Return-Path: <owner-freebsd-ipfw@FreeBSD.ORG>
Delivered-To: freebsd-ipfw@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F01A106566B
	for <freebsd-ipfw@hub.freebsd.org>;
	Fri,  6 May 2011 07:20:11 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 102D98FC08
	for <freebsd-ipfw@hub.freebsd.org>;
	Fri,  6 May 2011 07:20:11 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p467KAce029559
	for <freebsd-ipfw@freefall.freebsd.org>; Fri, 6 May 2011 07:20:10 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p467KAMY029558;
	Fri, 6 May 2011 07:20:10 GMT (envelope-from gnats)
Date: Fri, 6 May 2011 07:20:10 GMT
Message-Id: <201105060720.p467KAMY029558@freefall.freebsd.org>
To: freebsd-ipfw@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: bin/156838: commit references a PR
X-BeenThere: freebsd-ipfw@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: IPFW Technical Discussions <freebsd-ipfw.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ipfw>
List-Post: <mailto:freebsd-ipfw@freebsd.org>
List-Help: <mailto:freebsd-ipfw-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 May 2011 07:20:11 -0000

The following reply was made to PR bin/156838; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/156838: commit references a PR
Date: Fri,  6 May 2011 07:13:43 +0000 (UTC)

 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;
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"