diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-07-05 16:28:31 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-07-05 16:28:31 +0000 |
| commit | afd238548203ecc039b75cb3b8903521ec5c039b (patch) | |
| tree | 32be4595c067d2e53eae04c2c84ef041188741d1 /sys/net/bridge.c | |
| parent | c4117f759200d0362f81159ed2c11b939530ab3e (diff) | |
| download | FreeBSD-src-afd238548203ecc039b75cb3b8903521ec5c039b.zip FreeBSD-src-afd238548203ecc039b75cb3b8903521ec5c039b.tar.gz | |
In the BPF and ethernet bridging code, don't allow callouts to execute
without Giant if we're not debug.mpsafenet=1.
Diffstat (limited to 'sys/net/bridge.c')
| -rw-r--r-- | sys/net/bridge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/net/bridge.c b/sys/net/bridge.c index 0bbdf77..1f113ba 100644 --- a/sys/net/bridge.c +++ b/sys/net/bridge.c @@ -1199,7 +1199,7 @@ bdginit(void) bdgtakeifaces_ptr(); /* XXX does this do anything? */ - callout_init(&bdg_callout, CALLOUT_MPSAFE); + callout_init(&bdg_callout, debug_mpsafenet ? CALLOUT_MPSAFE : 0); bdg_timeout(0); return 0 ; } |
