summaryrefslogtreecommitdiffstats
path: root/sys/netinet/ip_dummynet.c
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2003-11-23 18:13:41 +0000
committersam <sam@FreeBSD.org>2003-11-23 18:13:41 +0000
commit083aa028f37d492262a870fd5a4e7e261465d21f (patch)
tree3322592f41a0bf2414a6963b08659d0d743f5782 /sys/netinet/ip_dummynet.c
parentc31eef63dcaccc525ce7f74c5ddd25e23b88fbe7 (diff)
downloadFreeBSD-src-083aa028f37d492262a870fd5a4e7e261465d21f.zip
FreeBSD-src-083aa028f37d492262a870fd5a4e7e261465d21f.tar.gz
Use MPSAFE callouts only when debug.mpsafenet is 1. Both timer routines
potentially transmit packets that may enter KAME IPsec w/o Giant if the callouts are marked MPSAFE. Reviewed by: ume Approved by: re (rwatson)
Diffstat (limited to 'sys/netinet/ip_dummynet.c')
-rw-r--r--sys/netinet/ip_dummynet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 7a37677..3f318fe 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -1995,7 +1995,7 @@ ip_dn_init(void)
ip_dn_io_ptr = dummynet_io;
ip_dn_ruledel_ptr = dn_rule_delete;
- callout_init(&dn_timeout, CALLOUT_MPSAFE);
+ callout_init(&dn_timeout, debug_mpsafenet ? CALLOUT_MPSAFE : 0);
callout_reset(&dn_timeout, 1, dummynet, NULL);
}
OpenPOWER on IntegriCloud