diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-06 21:03:06 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-06 21:03:06 +0000 |
| commit | dde7b00df07d5064317db5ff355091c989d5d684 (patch) | |
| tree | 7ea38e550451394317b7581ff5f8914bd269ec95 /sys/dev/pci/if_em.c | |
| parent | 236f5968eef75c8e14b0b020bb15cc2f53b5041e (diff) | |
Add a DVACT_WAKEUP op to the *_activate() API. This is called after the
kernel resumes normal (non-cold, able to run processes, etc) operation.
Previously we were relying on specific DVACT_RESUME op's in drivers
creating callback/threads themselves, but that has become too common,
indicating the need for a built-in mechanism.
ok dlg kettenis, tested by a sufficient amount of people
Diffstat (limited to 'sys/dev/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 4da60819b37..a1514417db4 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.273 2013/11/27 01:13:10 jsg Exp $ */ +/* $OpenBSD: if_em.c,v 1.274 2013/12/06 21:03:04 deraadt Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -1914,9 +1914,6 @@ em_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_QUIESCE: - rv = config_activate_children(self, act); - break; case DVACT_SUSPEND: if (ifp->if_flags & IFF_RUNNING) em_stop(sc, 0); @@ -1928,6 +1925,9 @@ em_activate(struct device *self, int act) if (ifp->if_flags & IFF_UP) em_init(sc); break; + default: + rv = config_activate_children(self, act); + break; } return (rv); } |