summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2010-08-30 23:25:15 +0000
committerderaadt <deraadt@openbsd.org>2010-08-30 23:25:15 +0000
commit91606a8ca3cc396c0615c37c2d00bb09ea221ae8 (patch)
treef540fccc7008efacbb98e562d5f0c9661e058ba5
parent- various tweaks and fixes for airport codes starting with A. (diff)
downloadwireguard-openbsd-91606a8ca3cc396c0615c37c2d00bb09ea221ae8.tar.xz
wireguard-openbsd-91606a8ca3cc396c0615c37c2d00bb09ea221ae8.zip
activate functions, when they do not add value, should return the result of config_activate_children
-rw-r--r--sys/dev/ic/dc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 7c4383f7507..d4e5fc52e0c 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc.c,v 1.117 2010/08/27 19:54:02 deraadt Exp $ */
+/* $OpenBSD: dc.c,v 1.118 2010/08/30 23:25:15 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -3129,20 +3129,21 @@ dc_activate(struct device *self, int act)
{
struct dc_softc *sc = (struct dc_softc *)self;
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
+ int rv;
switch (act) {
case DVACT_SUSPEND:
if (ifp->if_flags & IFF_RUNNING)
dc_stop(sc, 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)
dc_init(sc);
break;
}
- return (0);
+ return rv;
}
void