summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDariusz Swiderski <dms@cvs.openbsd.org>2009-11-26 15:53:16 +0000
committerDariusz Swiderski <dms@cvs.openbsd.org>2009-11-26 15:53:16 +0000
commit79c9c6ac5e7fbb9621444458d6568683f3b3491b (patch)
tree2fe4c5ce48d545300f4be92160b5e2b60343fca8
parent0409e160fd6bcb70618af283a1a5ff8e2e4b76b4 (diff)
em_stop() removes IFF_RUNNING flag, so we should rely on the IFF_UP being set
ok deraadt@
-rw-r--r--sys/dev/pci/if_em.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index d1acfddd3bb..caed84bf3d7 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.231 2009/11/26 13:47:02 dms Exp $ */
+/* $OpenBSD: if_em.c,v 1.232 2009/11/26 15:53:15 dms Exp $ */
/* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
#include <dev/pci/if_em.h>
@@ -1882,7 +1882,7 @@ em_activate(struct device *self, int act)
case DVACT_RESUME:
em_stop(sc, 0);
rv = config_activate_children(self, act);
- if (ifp->if_flags & IFF_RUNNING)
+ if (ifp->if_flags & IFF_UP)
em_init(sc);
break;
}