diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-09-16 01:20:27 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-09-16 01:20:27 +0000 |
| commit | 0c66a6d841221b81034bc8795357ec5ac1c5391b (patch) | |
| tree | e5ed027aa7d892069d3c9785756cdf6d7de0bb4c /sys/dev/pci | |
| parent | 28d5416bc768af75d67fc7f95972160fc87564ec (diff) | |
Asking for HWERR interrupts and not acknowledging them leads
to interrupt storms on several machines, so don't ask.
Diff from kettenis@ who can't commit at the moment.
ok deraadt@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/if_msk.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 1a05603681a..e30c959807f 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.16 2006/08/25 00:21:10 brad Exp $ */ +/* $OpenBSD: if_msk.c,v 1.17 2006/09/16 01:20:26 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -2032,11 +2032,9 @@ msk_init(void *xsc_if) sc->sk_intrmask |= SK_Y2_INTRS1; else sc->sk_intrmask |= SK_Y2_INTRS2; - sc->sk_intrmask |= SK_Y2_IMR_HWERR | SK_Y2_IMR_BMU; + sc->sk_intrmask |= SK_Y2_IMR_BMU; CSR_WRITE_4(sc, SK_IMR, sc->sk_intrmask); - CSR_WRITE_4(sc, SK_IEMR, 0x2e00003f); - ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; |