diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-31 16:29:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-31 16:29:57 +0000 |
| commit | ed61dbfa1f399f743876d0ebce54a2039d1ecf23 (patch) | |
| tree | 3fa4bb7b65557a967a91dee4bbc9b9788dc8c189 /sys | |
| parent | f83ac2a911594e6e52bcb1b99774c0946a41019d (diff) | |
activate function should return result of config_activate_children
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/fxp.c | 9 | ||||
| -rw-r--r-- | sys/dev/ic/xl.c | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index 415531efa63..8cbb5f45dfa 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.103 2010/08/27 18:25:47 deraadt Exp $ */ +/* $OpenBSD: fxp.c,v 1.104 2010/08/31 16:29:10 deraadt Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -294,21 +294,22 @@ fxp_activate(struct device *self, int act) { struct fxp_softc *sc = (struct fxp_softc *)self; struct ifnet *ifp = &sc->sc_arpcom.ac_if; + int rv; switch (act) { case DVACT_SUSPEND: if (ifp->if_flags & IFF_RUNNING) fxp_stop(sc, 1, 0); - config_activate_children(self, act); + rv = config_activate_children(self, act); break; case DVACT_RESUME: - config_activate_children(self, act); + rv = config_activate_children(self, act); if (ifp->if_flags & IFF_UP) workq_queue_task(NULL, &sc->sc_resume_wqt, 0, fxp_resume, sc, NULL); break; } - return 0; + return (rv); } void diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index 751501f438d..2be0cce4e09 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.92 2010/08/27 15:43:41 deraadt Exp $ */ +/* $OpenBSD: xl.c,v 1.93 2010/08/31 16:29:56 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -200,6 +200,7 @@ xl_activate(struct device *self, int act) { struct xl_softc *sc = (struct xl_softc *)self; struct ifnet *ifp = &sc->sc_arpcom.ac_if; + int rv; switch (act) { case DVACT_SUSPEND: @@ -207,16 +208,16 @@ xl_activate(struct device *self, int act) xl_reset(sc); xl_stop(sc); } - config_activate_children(self, act); + rv = config_activate_children(self, act); break; case DVACT_RESUME: xl_reset(sc); - config_activate_children(self, act); + rv = config_activate_children(self, act); if (ifp->if_flags & IFF_UP) xl_init(sc); break; } - return (0); + return (rv); } void |