diff options
| author | sam <sam@FreeBSD.org> | 2003-11-23 18:13:41 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2003-11-23 18:13:41 +0000 |
| commit | 083aa028f37d492262a870fd5a4e7e261465d21f (patch) | |
| tree | 3322592f41a0bf2414a6963b08659d0d743f5782 /sys/netinet/ip_fw2.c | |
| parent | c31eef63dcaccc525ce7f74c5ddd25e23b88fbe7 (diff) | |
| download | FreeBSD-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_fw2.c')
| -rw-r--r-- | sys/netinet/ip_fw2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netinet/ip_fw2.c b/sys/netinet/ip_fw2.c index 999d064..19799bc 100644 --- a/sys/netinet/ip_fw2.c +++ b/sys/netinet/ip_fw2.c @@ -2924,7 +2924,7 @@ ipfw_init(void) layer3_chain.rules = NULL; IPFW_LOCK_INIT(&layer3_chain); IPFW_DYN_LOCK_INIT(); - callout_init(&ipfw_timeout, CALLOUT_MPSAFE); + callout_init(&ipfw_timeout, debug_mpsafenet ? CALLOUT_MPSAFE : 0); bzero(&default_rule, sizeof default_rule); |
