svn commit: r221831 - stable/8/sys/netinet/ipfw

[Andrey V. Elsukov]

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;