summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-28 03:35:43 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-28 03:35:43 +0000
commit93b3f593ddd4125e939aba3fb5c207a1472fc734 (patch)
treef0a46536d725ca847f14d8e8efbd2850233f34b2 /sys
parent296554f245d538f85433e04ad9d0bc2a00202913 (diff)
The few network drivers that called their children's (ie. mii PHY
drivers) activate functions at DVACT_RESUME time do not need to do so, since their PHYs are repaired by IFF_UP. NOTE: if_msk is the one that previously relied on mii/eephy.c doing a crazy dance.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_msk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index fc55ce443f8..21ee4e03d2b 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_msk.c,v 1.101 2013/12/08 16:39:38 deraadt Exp $ */
+/* $OpenBSD: if_msk.c,v 1.102 2013/12/28 03:35:42 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -1075,7 +1075,6 @@ msk_activate(struct device *self, int act)
switch (act) {
case DVACT_RESUME:
msk_reset(sc_if);
- rv = config_activate_children(self, act);
if (ifp->if_flags & IFF_RUNNING)
msk_init(sc_if);
break;