diff options
| author |   deraadt <deraadt@openbsd.org> | 2012-10-13 17:24:46 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2012-10-13 17:24:46 +0000 |
| commit | ad60d56ab517b2d56e8e296b446db088ba1ecd60 (patch) | |
| tree | 942c29dc3e92c458bd44e9244bea19e27c0bd8ab | |
| parent | This device should not put itself into D3 by itself when going to WOL; (diff) | |
| download | wireguard-openbsd-ad60d56ab517b2d56e8e296b446db088ba1ecd60.tar.xz wireguard-openbsd-ad60d56ab517b2d56e8e296b446db088ba1ecd60.zip | |
Move WOL activation to DVACT_POWERDOWN (instead of doing it twice, at
DVACT_QUIESCE and DVACT_SUSPEND time).
Tested by stsp.
| -rw-r--r-- | sys/dev/ic/xl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index 1ef4ab1b150..6ffe18235f5 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.105 2012/02/24 06:19:00 guenther Exp $ */ +/* $OpenBSD: xl.c,v 1.106 2012/10/13 17:24:46 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -205,9 +205,6 @@ xl_activate(struct device *self, int act) switch (act) { case DVACT_QUIESCE: -#ifndef SMALL_KERNEL - xl_wol_power(sc); -#endif rv = config_activate_children(self, act); break; case DVACT_SUSPEND: @@ -215,10 +212,13 @@ xl_activate(struct device *self, int act) xl_reset(sc); xl_stop(sc); } + rv = config_activate_children(self, act); + break; + case DVACT_POWERDOWN: + rv = config_activate_children(self, act); #ifndef SMALL_KERNEL xl_wol_power(sc); #endif - rv = config_activate_children(self, act); break; case DVACT_RESUME: xl_reset(sc); |