diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-08 16:36:34 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-08 16:36:34 +0000 |
| commit | 0946234057183a7e0e4ac733ceb4983302b53f3d (patch) | |
| tree | 27b575d8b4abae09793e38138acbbcbb5dbe9c4f /sys/dev/ic | |
| parent | 00c733b04cefd26163743557b97145c37d376439 (diff) | |
activate function for suspend/restore; from mglocker
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/malo.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/malo.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c index c87afadadcc..3dd897f25f9 100644 --- a/sys/dev/ic/malo.c +++ b/sys/dev/ic/malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.c,v 1.90 2010/05/19 15:27:35 oga Exp $ */ +/* $OpenBSD: malo.c,v 1.91 2010/08/08 16:36:33 deraadt Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -26,6 +26,7 @@ #include <sys/device.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/workq.h> #include <sys/mbuf.h> #include <sys/proc.h> #include <sys/socket.h> @@ -248,10 +249,8 @@ int malo_alloc_tx_ring(struct malo_softc *sc, struct malo_tx_ring *ring, int count); void malo_reset_tx_ring(struct malo_softc *sc, struct malo_tx_ring *ring); void malo_free_tx_ring(struct malo_softc *sc, struct malo_tx_ring *ring); -int malo_init(struct ifnet *ifp); int malo_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); void malo_start(struct ifnet *ifp); -void malo_stop(struct malo_softc *sc); void malo_watchdog(struct ifnet *ifp); int malo_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg); diff --git a/sys/dev/ic/malo.h b/sys/dev/ic/malo.h index 91634cf1ec8..c0969d71d24 100644 --- a/sys/dev/ic/malo.h +++ b/sys/dev/ic/malo.h @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.h,v 1.9 2006/11/24 20:45:33 mglocker Exp $ */ +/* $OpenBSD: malo.h,v 1.10 2010/08/08 16:36:33 deraadt Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -124,8 +124,11 @@ struct malo_softc { #define sc_txtap sc_txtapu.th int sc_txtap_len; #endif + struct workq_task sc_resume_wqt; }; int malo_intr(void *arg); int malo_attach(struct malo_softc *sc); int malo_detach(void *arg); +int malo_init(struct ifnet *); +void malo_stop(struct malo_softc *); |