diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-10-09 20:50:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-10-09 20:50:33 +0000 |
| commit | f525aa18133c0ed3c4af447ce46e78ef516bb8ee (patch) | |
| tree | 7d3c1f09b181a250df293e1334e8841262cd72cf /sys | |
| parent | e63b410bd2d2ea83a174720f32baf4ebe8201f7f (diff) | |
A working detach function. Has no impact on anything else in the driver.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_em.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 2670ea5ec58..457b0014fca 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.222 2009/09/04 22:13:51 dms Exp $ */ +/* $OpenBSD: if_em.c,v 1.223 2009/10/09 20:50:32 deraadt Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -152,6 +152,7 @@ const struct pci_matchid em_devices[] = { *********************************************************************/ int em_probe(struct device *, void *, void *); void em_attach(struct device *, struct device *, void *); +int em_detach(struct device *, int); int em_intr(void *); void em_power(int, void *); void em_start(struct ifnet *); @@ -219,7 +220,7 @@ u_int32_t em_fill_descriptors(u_int64_t address, u_int32_t length, *********************************************************************/ struct cfattach em_ca = { - sizeof(struct em_softc), em_probe, em_attach + sizeof(struct em_softc), em_probe, em_attach, em_detach }; struct cfdriver em_cd = { @@ -1753,6 +1754,25 @@ em_setup_interface(struct em_softc *sc) ether_ifattach(ifp); } +int +em_detach(struct device *self, int flags) +{ + struct em_softc *sc = (struct em_softc *)self; + struct ifnet *ifp = &sc->interface_data.ac_if; + + em_dma_free(sc, &sc->rxdma); + em_dma_free(sc, &sc->txdma); + em_free_pci_resources(sc); + + ether_ifdetach(ifp); + if_detach(ifp); + + if (sc->sc_powerhook != NULL) + powerhook_disestablish(sc->sc_powerhook); + + return (0); +} + /********************************************************************* * |