summaryrefslogtreecommitdiffstats
path: root/sys/dev/pci/if_em.c
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2009-08-10 19:41:05 +0000
committerderaadt <deraadt@openbsd.org>2009-08-10 19:41:05 +0000
commit4ffe6de589ac4bca0097e20124ae0c10c27cef0b (patch)
treeef93c1a8bc4b74480649f872dcb33e7cf1c359dc /sys/dev/pci/if_em.c
parentclear the beacons owner/valid bits to avoid garbage. (diff)
downloadwireguard-openbsd-4ffe6de589ac4bca0097e20124ae0c10c27cef0b.tar.xz
wireguard-openbsd-4ffe6de589ac4bca0097e20124ae0c10c27cef0b.zip
A few more simple cases of shutdown hooks which only call xxstop, when
we now know the interface has already been stopped
Diffstat (limited to 'sys/dev/pci/if_em.c')
-rw-r--r--sys/dev/pci/if_em.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 9a7155f2ab6..394e0b1acef 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.216 2009/08/09 11:40:56 deraadt Exp $ */
+/* $OpenBSD: if_em.c,v 1.217 2009/08/10 19:41:05 deraadt Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@@ -152,7 +152,6 @@ const struct pci_matchid em_devices[] = {
*********************************************************************/
int em_probe(struct device *, void *, void *);
void em_attach(struct device *, struct device *, void *);
-void em_shutdown(void *);
int em_intr(void *);
void em_power(int, void *);
void em_start(struct ifnet *);
@@ -438,7 +437,6 @@ em_attach(struct device *parent, struct device *self, void *aux)
sc->pcix_82544 = FALSE;
INIT_DEBUGOUT("em_attach: end");
sc->sc_powerhook = powerhook_establish(em_power, sc);
- sc->sc_shutdownhook = shutdownhook_establish(em_shutdown, sc);
return;
err_mac_addr:
@@ -465,20 +463,6 @@ em_power(int why, void *arg)
}
/*********************************************************************
- *
- * Shutdown entry point
- *
- **********************************************************************/
-
-void
-em_shutdown(void *arg)
-{
- struct em_softc *sc = arg;
-
- em_stop(sc);
-}
-
-/*********************************************************************
* Transmit entry point
*
* em_start is called by the stack to initiate a transmit.