svn commit: r221521 - head/sys/netinet/ipfw

Andrey V. Elsukov ae at FreeBSD.org
Fri May 6 07:13:34 UTC 2011


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;


More information about the svn-src-head mailing list