diff options
author | David Gwynne <dlg@cvs.openbsd.org> | 2007-01-20 00:36:09 +0000 |
---|---|---|
committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-01-20 00:36:09 +0000 |
commit | bb36b97051abda47dc8c7936bea8fc621756b93d (patch) | |
tree | f2d66bea3c428da1f37714da025a438e573f92ab /sys/dev/pci/if_bnxreg.h | |
parent | a603dc203c85611b8ba9af04a118553cf377b477 (diff) |
move the interrupt establishment till after everything in the softc is
set up and allocated (which happens in a mountroothook). this prevents an
early call to the interrupt handler from causing a null deref when trying
to look into the unallocated regions.
found by mcbride when ciss and bnx were sharing an interrupt. mounting
root caused interrupts before the bnx was properly set up.
"commit your fix" mcbride@
Diffstat (limited to 'sys/dev/pci/if_bnxreg.h')
-rw-r--r-- | sys/dev/pci/if_bnxreg.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/pci/if_bnxreg.h b/sys/dev/pci/if_bnxreg.h index 1239b935f7f..958c5febdd8 100644 --- a/sys/dev/pci/if_bnxreg.h +++ b/sys/dev/pci/if_bnxreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnxreg.h,v 1.17 2006/11/20 21:26:27 brad Exp $ */ +/* $OpenBSD: if_bnxreg.h,v 1.18 2007/01/20 00:36:08 dlg Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -4587,7 +4587,9 @@ struct bnx_softc { struct device bnx_dev; /* Parent device handle */ struct arpcom arpcom; + struct pci_attach_args bnx_pa; + pci_intr_handle_t bnx_ih; struct ifmedia bnx_ifmedia; /* TBI media info */ |