From 4eab03bf6c95e3df50fb449d1c8f0a7571960a90 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 28 Dec 2013 03:35:42 +0000 Subject: [PATCH] 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. --- sys/dev/pci/if_msk.c | 3 +-- 1 file changed, 1 insertion(+), 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; -- 2.20.1