From: deraadt <deraadt@openbsd.org>
Date: Tue, 27 Jul 2010 00:03:03 +0000 (+0000)
Subject: ca_activate function brings eeepc 1000HE back after resume.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1ba7ad036371288a21e3693f85f44c4bd50e5f09;p=openbsd

ca_activate function brings eeepc 1000HE back after resume.
tested by krw
---

diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 1a3920c3f82..b579bc15e40 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ale.c,v 1.13 2010/05/19 14:39:07 oga Exp $	*/
+/*	$OpenBSD: if_ale.c,v 1.14 2010/07/27 00:03:03 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -81,6 +81,7 @@
 int	ale_match(struct device *, void *, void *);
 void	ale_attach(struct device *, struct device *, void *);
 int	ale_detach(struct device *, int);
+int	ale_activate(struct device *, int);
 
 int	ale_miibus_readreg(struct device *, int, int);
 void	ale_miibus_writereg(struct device *, int, int, int);
@@ -123,7 +124,8 @@ const struct pci_matchid ale_devices[] = {
 };
 
 struct cfattach ale_ca = {
-	sizeof (struct ale_softc), ale_match, ale_attach
+	sizeof (struct ale_softc), ale_match, ale_attach, NULL,
+	ale_activate
 };
 
 struct cfdriver ale_cd = {
@@ -597,6 +599,27 @@ ale_detach(struct device *self, int flags)
 	return (0);
 }
 
+int
+ale_activate(struct device *self, int act)
+{
+	struct ale_softc *sc = (struct ale_softc *)self;
+	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
+	int rv = 0;
+
+	switch (act) {
+	case DVACT_SUSPEND:
+		if (ifp->if_flags & IFF_RUNNING)
+			ale_stop(sc);
+		rv = config_activate_children(self, act);
+		break;
+	case DVACT_RESUME:
+		rv = config_activate_children(self, act);
+		if (ifp->if_flags & IFF_UP)
+			ale_init(ifp);
+		break;
+	}
+	return rv;
+}
 
 int
 ale_dma_alloc(struct ale_softc *sc)