diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-28 03:35:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-28 03:35:02 +0000 |
| commit | 296554f245d538f85433e04ad9d0bc2a00202913 (patch) | |
| tree | 934098b639a536f6691397d6e581339aeae04f60 /sys/dev/pci/if_em.c | |
| parent | 3158f5b9810d9538afa5260859a5eabbf5af0284 (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.
Diffstat (limited to 'sys/dev/pci/if_em.c')
| -rw-r--r-- | sys/dev/pci/if_em.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index a1514417db4..5ebaaaa1a2c 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.274 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: if_em.c,v 1.275 2013/12/28 03:34:54 deraadt Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -1921,7 +1921,6 @@ em_activate(struct device *self, int act) rv = config_activate_children(self, act); break; case DVACT_RESUME: - rv = config_activate_children(self, act); if (ifp->if_flags & IFF_UP) em_init(sc); break; |