summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_sis.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-28 03:35:02 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-12-28 03:35:02 +0000
commit296554f245d538f85433e04ad9d0bc2a00202913 (patch)
tree934098b639a536f6691397d6e581339aeae04f60 /sys/dev/pci/if_sis.c
parent3158f5b9810d9538afa5260859a5eabbf5af0284 (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_sis.c')
-rw-r--r--sys/dev/pci/if_sis.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index 6674734ca51..6588ebade1e 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sis.c,v 1.114 2013/12/06 21:03:04 deraadt Exp $ */
+/* $OpenBSD: if_sis.c,v 1.115 2013/12/28 03:34:54 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -1217,7 +1217,6 @@ sis_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)
sis_init(sc);
break;