diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-12-06 21:03:01 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-12-06 21:03:01 +0000 |
| commit | 37ecb59650d3f381e0120446318f17da385095e3 (patch) | |
| tree | c81a3d99b5090a799f492b07d59e5f336209bce0 /sys/dev/pci/if_sis.c | |
| parent | It seems to be possible to truncate an object while it is still mapped. (diff) | |
| download | wireguard-openbsd-37ecb59650d3f381e0120446318f17da385095e3.tar.xz wireguard-openbsd-37ecb59650d3f381e0120446318f17da385095e3.zip | |
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_sis.c')
| -rw-r--r-- | sys/dev/pci/if_sis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index b33fe005453..6674734ca51 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.113 2013/08/21 05:21:44 dlg Exp $ */ +/* $OpenBSD: if_sis.c,v 1.114 2013/12/06 21:03:04 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -1211,9 +1211,6 @@ sis_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) sis_stop(sc); @@ -1224,6 +1221,9 @@ sis_activate(struct device *self, int act) if (ifp->if_flags & IFF_UP) sis_init(sc); break; + default: + rv = config_activate_children(self, act); + break; } return (rv); } |