diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-05-23 22:22:29 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-05-23 22:22:29 +0000 |
| commit | f3abcf3aa7329c307464f3c684bc478b05b2a668 (patch) | |
| tree | 2fdd9d03e2dcfe475307c8c180db3cc773bfd684 /sys/pci | |
| parent | 37581d73985792a5398220d48cac631cad39b7f9 (diff) | |
| download | FreeBSD-src-f3abcf3aa7329c307464f3c684bc478b05b2a668.zip FreeBSD-src-f3abcf3aa7329c307464f3c684bc478b05b2a668.tar.gz | |
Only initialize the if_sis callout as MPSAFE if debug.mpsafenet is set
true. Otherwise, assertion checks for Giant in the network stack will
fail causing a panic.
Reported by: simon
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/if_sis.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index f8c92c9..02dac7c 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -1234,7 +1234,10 @@ sis_attach(dev) } sc->sis_unit = unit; - callout_init(&sc->sis_stat_ch, CALLOUT_MPSAFE); + if (debug_mpsafenet) + callout_init(&sc->sis_stat_ch, CALLOUT_MPSAFE); + else + callout_init(&sc->sis_stat_ch, 0); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); /* |
