diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-04 11:33:00 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-04 15:28:21 +0100 |
commit | af5333e0a02b2295304d4e029b15ee15a4fe2b3a (patch) | |
tree | c5c43680d374f58b487eeeaf18fb7ec6b84ba074 /freebsd/sys/netinet/ipfw/ip_dn_glue.c | |
parent | BUS_SPACE(9): Use simple memory model for ARM (diff) | |
download | rtems-libbsd-af5333e0a02b2295304d4e029b15ee15a4fe2b3a.tar.bz2 |
Update to FreeBSD 8.4
Diffstat (limited to 'freebsd/sys/netinet/ipfw/ip_dn_glue.c')
-rw-r--r-- | freebsd/sys/netinet/ipfw/ip_dn_glue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/freebsd/sys/netinet/ipfw/ip_dn_glue.c b/freebsd/sys/netinet/ipfw/ip_dn_glue.c index 8c8c3ef8..2b109771 100644 --- a/freebsd/sys/netinet/ipfw/ip_dn_glue.c +++ b/freebsd/sys/netinet/ipfw/ip_dn_glue.c @@ -626,7 +626,7 @@ dn_c_copy_pipe(struct dn_schk *s, struct copy_args *a, int nq) /* 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) { @@ -809,7 +809,7 @@ ip_dummynet_compat(struct sockopt *sopt) if (error) break; error = dn_compat_del(v); - free(v, M_DUMMYNET); + free(v, M_TEMP); break; case IP_DUMMYNET_CONFIGURE: @@ -818,7 +818,7 @@ ip_dummynet_compat(struct sockopt *sopt) if (error) break; error = dn_compat_configure(v); - free(v, M_DUMMYNET); + free(v, M_TEMP); break; case IP_DUMMYNET_GET: { |