From owner-svn-src-stable-8@FreeBSD.ORG Fri May 13 09:52:04 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFB38106566B; Fri, 13 May 2011 09:52:04 +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 AEF998FC12; Fri, 13 May 2011 09:52:04 +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 p4D9q4io065972; Fri, 13 May 2011 09:52:04 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4D9q4lg065969; Fri, 13 May 2011 09:52:04 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201105130952.p4D9q4lg065969@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Fri, 13 May 2011 09:52:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221831 - stable/8/sys/netinet/ipfw X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2011 09:52:04 -0000 Author: ae Date: Fri May 13 09:52:04 2011 New Revision: 221831 URL: http://svn.freebsd.org/changeset/base/221831 Log: MFC r221521: Convert delay parameter back to ms when reporting to user. PR: 156838 Modified: stable/8/sys/netinet/ipfw/ip_dn_glue.c stable/8/sys/netinet/ipfw/ip_dummynet.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/netinet/ipfw/ip_dn_glue.c ============================================================================== --- stable/8/sys/netinet/ipfw/ip_dn_glue.c Fri May 13 07:21:41 2011 (r221830) +++ stable/8/sys/netinet/ipfw/ip_dn_glue.c Fri May 13 09:52:04 2011 (r221831) @@ -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: stable/8/sys/netinet/ipfw/ip_dummynet.c ============================================================================== --- stable/8/sys/netinet/ipfw/ip_dummynet.c Fri May 13 07:21:41 2011 (r221830) +++ stable/8/sys/netinet/ipfw/ip_dummynet.c Fri May 13 09:52:04 2011 (r221831) @@ -807,6 +807,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;