From fa9fb3ed2a2ed9495e658a9ca477e4abe992c335 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 28 Dec 2013 03:30:40 +0000
Subject: [PATCH] mii drivers no longer need activate functions.  Repair of the
 PHY configuration setting is done at resume time because all networks drivers
 which were previously up, do an IFF_UP operation which hits PHY_RESET. This
 was in snapshots for about 2 weeks.

---
 sys/dev/mii/acphy.c       |  5 ++---
 sys/dev/mii/amphy.c       |  5 ++---
 sys/dev/mii/atphy.c       |  4 ++--
 sys/dev/mii/bmtphy.c      |  5 ++---
 sys/dev/mii/brgphy.c      |  5 ++---
 sys/dev/mii/ciphy.c       |  8 ++------
 sys/dev/mii/dcphy.c       |  5 ++---
 sys/dev/mii/etphy.c       |  4 ++--
 sys/dev/mii/exphy.c       |  5 ++---
 sys/dev/mii/gentbi.c      |  4 ++--
 sys/dev/mii/icsphy.c      |  5 ++---
 sys/dev/mii/inphy.c       |  5 ++---
 sys/dev/mii/iophy.c       |  5 ++---
 sys/dev/mii/ipgphy.c      |  8 ++++----
 sys/dev/mii/jmphy.c       |  6 +++---
 sys/dev/mii/luphy.c       |  5 ++---
 sys/dev/mii/lxtphy.c      |  5 ++---
 sys/dev/mii/mii_physubr.c | 16 +---------------
 sys/dev/mii/miivar.h      |  3 +--
 sys/dev/mii/mlphy.c       |  7 +++----
 sys/dev/mii/mtdphy.c      |  5 ++---
 sys/dev/mii/nsgphy.c      |  5 ++---
 sys/dev/mii/nsphy.c       |  5 ++---
 sys/dev/mii/nsphyter.c    |  4 ++--
 sys/dev/mii/qsphy.c       |  5 ++---
 sys/dev/mii/rdcphy.c      |  4 ++--
 sys/dev/mii/rgephy.c      | 10 +++-------
 sys/dev/mii/rlphy.c       |  5 ++---
 sys/dev/mii/sqphy.c       |  5 ++---
 sys/dev/mii/tlphy.c       |  5 ++---
 sys/dev/mii/tqphy.c       |  5 ++---
 sys/dev/mii/txphy.c       |  5 ++---
 sys/dev/mii/ukphy.c       |  5 ++---
 sys/dev/mii/urlphy.c      |  5 ++---
 sys/dev/mii/xmphy.c       |  5 ++---
 35 files changed, 73 insertions(+), 120 deletions(-)

diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 6e77924360e..ea249a09c76 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acphy.c,v 1.6 2006/12/27 19:11:08 kettenis Exp $	*/
+/*	$OpenBSD: acphy.c,v 1.7 2013/12/28 03:30:40 deraadt Exp $	*/
 /*	$NetBSD: acphy.c,v 1.13 2003/04/29 01:49:33 thorpej Exp $	*/
 
 /*
@@ -60,8 +60,7 @@ int	acphymatch(struct device *, void *, void *);
 void	acphyattach(struct device *, struct device *, void *);
 
 struct cfattach acphy_ca = {
-	sizeof(struct mii_softc), acphymatch, acphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), acphymatch, acphyattach, mii_phy_detach
 };
 
 struct cfdriver acphy_cd = {
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index a6b46a0c04d..ec9be576118 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amphy.c,v 1.18 2008/09/08 07:38:33 brad Exp $	*/
+/*	$OpenBSD: amphy.c,v 1.19 2013/12/28 03:30:40 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -59,8 +59,7 @@ int	amphymatch(struct device *, void *, void *);
 void	amphyattach(struct device *, struct device *, void *);
 
 struct cfattach amphy_ca = {
-	sizeof(struct mii_softc), amphymatch, amphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), amphymatch, amphyattach, mii_phy_detach
 };
 
 struct cfdriver amphy_cd = {
diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index 87c79b838f5..24429ba30c2 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atphy.c,v 1.6 2011/06/17 09:59:52 kevlo Exp $	*/
+/*	$OpenBSD: atphy.c,v 1.7 2013/12/28 03:30:40 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -94,7 +94,7 @@ static const struct mii_phydesc atphys[] = {
 
 struct cfattach atphy_ca = {
 	sizeof (struct mii_softc), atphy_match, atphy_attach,
-	mii_phy_detach, mii_phy_activate
+	mii_phy_detach
 };
 
 struct cfdriver atphy_cd = {
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index fce46460b4c..cfed9241bc8 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bmtphy.c,v 1.17 2009/07/25 09:56:24 sthen Exp $	*/
+/*	$OpenBSD: bmtphy.c,v 1.18 2013/12/28 03:30:40 deraadt Exp $	*/
 /*	$NetBSD: bmtphy.c,v 1.17 2005/01/17 13:17:45 scw Exp $	*/
 
 /*-
@@ -52,8 +52,7 @@ int	bmtphymatch(struct device *, void *, void *);
 void	bmtphyattach(struct device *, struct device *, void *);
 
 struct cfattach bmtphy_ca = {
-	sizeof(struct mii_softc), bmtphymatch, bmtphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), bmtphymatch, bmtphyattach, mii_phy_detach
 };
 
 struct cfdriver bmtphy_cd = {
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index fe39a3e0ea6..d357d5a5908 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brgphy.c,v 1.102 2013/05/28 09:46:06 mikeb Exp $	*/
+/*	$OpenBSD: brgphy.c,v 1.103 2013/12/28 03:30:40 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -64,8 +64,7 @@ int brgphy_probe(struct device *, void *, void *);
 void brgphy_attach(struct device *, struct device *, void *);
 
 struct cfattach brgphy_ca = {
-	sizeof(struct mii_softc), brgphy_probe, brgphy_attach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), brgphy_probe, brgphy_attach, mii_phy_detach
 };
 
 struct cfdriver brgphy_cd = {
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index a6b2d9336d7..823995e0c93 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciphy.c,v 1.23 2012/10/22 09:14:36 brad Exp $	*/
+/*	$OpenBSD: ciphy.c,v 1.24 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$FreeBSD: ciphy.c,v 1.1 2004/09/10 20:57:45 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -58,11 +58,7 @@ int	ciphymatch(struct device *, void *, void *);
 void	ciphyattach(struct device *, struct device *, void *);
 
 struct cfattach ciphy_ca = {
-	sizeof(struct mii_softc),
-	ciphymatch,
-	ciphyattach,
-	mii_phy_detach,
-	mii_phy_activate
+	sizeof(struct mii_softc), ciphymatch, ciphyattach, mii_phy_detach
 };
 
 struct cfdriver ciphy_cd = {
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index bde973f28fe..09bedb3bdb8 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcphy.c,v 1.24 2013/05/28 09:46:06 mikeb Exp $	*/
+/*	$OpenBSD: dcphy.c,v 1.25 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -85,8 +85,7 @@ int	dcphy_match(struct device *, void *, void *);
 void	dcphy_attach(struct device *, struct device *, void *);
 
 struct cfattach dcphy_ca = {
-	sizeof(struct mii_softc), dcphy_match, dcphy_attach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), dcphy_match, dcphy_attach, mii_phy_detach
 };
 
 struct cfdriver dcphy_cd = {
diff --git a/sys/dev/mii/etphy.c b/sys/dev/mii/etphy.c
index 88b569f012a..10addc5ca78 100644
--- a/sys/dev/mii/etphy.c
+++ b/sys/dev/mii/etphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: etphy.c,v 1.4 2008/04/02 20:12:58 brad Exp $	*/
+/*	$OpenBSD: etphy.c,v 1.5 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -92,7 +92,7 @@ static const struct mii_phydesc etphys[] = {
 
 struct cfattach etphy_ca = {
 	sizeof (struct mii_softc), etphy_match, etphy_attach,
-	mii_phy_detach, mii_phy_activate
+	mii_phy_detach
 };
 
 struct cfdriver etphy_cd = {
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 72fc4967f25..f38c6e726cf 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exphy.c,v 1.20 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: exphy.c,v 1.21 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: exphy.c,v 1.23 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*-
@@ -76,8 +76,7 @@ int	exphymatch(struct device *, void *, void *);
 void	exphyattach(struct device *, struct device *, void *);
 
 struct cfattach exphy_ca = {
-	sizeof(struct mii_softc), exphymatch, exphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), exphymatch, exphyattach, mii_phy_detach
 };
 
 struct cfdriver exphy_cd = {
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 0b9c01f42a2..51db17b6eb7 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gentbi.c,v 1.8 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: gentbi.c,v 1.9 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: gentbi.c,v 1.12 2004/04/11 15:40:56 thorpej Exp $	*/
 
 /*-
@@ -81,7 +81,7 @@ void	gentbiattach(struct device *, struct device *, void *);
 
 struct cfattach gentbi_ca = {
 	sizeof(struct mii_softc), gentbimatch, gentbiattach,
-	    mii_phy_detach, mii_phy_activate
+	mii_phy_detach
 };
 
 struct cfdriver gentbi_cd = {
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index a6b6d955666..e0029898b0e 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icsphy.c,v 1.20 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: icsphy.c,v 1.21 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: icsphy.c,v 1.17 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*-
@@ -80,8 +80,7 @@ int	icsphymatch(struct device *, void *, void *);
 void	icsphyattach(struct device *, struct device *, void *);
 
 struct cfattach icsphy_ca = {
-	sizeof(struct mii_softc), icsphymatch, icsphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), icsphymatch, icsphyattach, mii_phy_detach
 };
 
 struct cfdriver icsphy_cd = {
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index d5a71b34d0e..56935245469 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inphy.c,v 1.18 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: inphy.c,v 1.19 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: inphy.c,v 1.18 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*-
@@ -80,8 +80,7 @@ int	inphymatch(struct device *, void *, void *);
 void	inphyattach(struct device *, struct device *, void *);
 
 struct cfattach inphy_ca = {
-	sizeof(struct mii_softc), inphymatch, inphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), inphymatch, inphyattach, mii_phy_detach
 };
 
 struct cfdriver inphy_cd = {
diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c
index f9b321e0919..c779bfcbc5e 100644
--- a/sys/dev/mii/iophy.c
+++ b/sys/dev/mii/iophy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iophy.c,v 1.17 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: iophy.c,v 1.18 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: iophy.c,v 1.8 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*
@@ -78,8 +78,7 @@ int	iophymatch(struct device *, void *, void *);
 void	iophyattach(struct device *, struct device *, void *);
 
 struct cfattach iophy_ca = {
-	sizeof(struct mii_softc), iophymatch, iophyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), iophymatch, iophyattach, mii_phy_detach
 };
 
 struct cfdriver iophy_cd = {
diff --git a/sys/dev/mii/ipgphy.c b/sys/dev/mii/ipgphy.c
index f715d96d0a4..030ace456dc 100644
--- a/sys/dev/mii/ipgphy.c
+++ b/sys/dev/mii/ipgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipgphy.c,v 1.15 2013/03/14 17:02:15 brad Exp $	*/
+/*	$OpenBSD: ipgphy.c,v 1.16 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -59,8 +59,7 @@ int ipgphy_probe(struct device *, void *, void *);
 void ipgphy_attach(struct device *, struct device *, void *);
 
 struct cfattach ipgphy_ca = {
-	sizeof(struct mii_softc), ipgphy_probe, ipgphy_attach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), ipgphy_probe, ipgphy_attach, mii_phy_detach
 };
 
 struct cfdriver ipgphy_cd = {
@@ -118,13 +117,14 @@ ipgphy_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->mii_flags |= MIIF_NOISOLATE;
 
+	PHY_RESET(sc);
+
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	if (sc->mii_capabilities & BMSR_EXTSTAT)
 		sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
  
 	mii_phy_add_media(sc);
 
-	PHY_RESET(sc);
 }
 
 int
diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c
index 25048721762..afc7094d33a 100644
--- a/sys/dev/mii/jmphy.c
+++ b/sys/dev/mii/jmphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: jmphy.c,v 1.3 2012/10/22 11:01:59 brad Exp $	*/
+/*	$OpenBSD: jmphy.c,v 1.4 2013/12/28 03:30:41 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -61,7 +61,7 @@ const struct mii_phy_funcs jmphy_funcs = {
 
 struct cfattach jmphy_ca = {
 	sizeof (struct mii_softc), jmphy_match, jmphy_attach,
-	mii_phy_detach, mii_phy_activate
+	mii_phy_detach
 };
 
 struct cfdriver jmphy_cd = {
@@ -108,7 +108,7 @@ jmphy_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->mii_flags |= MIIF_NOISOLATE | MIIF_NOLOOP;
 
-	jmphy_reset(sc);
+	PHY_RESET(sc);
 
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	if (sc->mii_capabilities & BMSR_EXTSTAT)
diff --git a/sys/dev/mii/luphy.c b/sys/dev/mii/luphy.c
index ebca16fa944..c9bbfc7eb4a 100644
--- a/sys/dev/mii/luphy.c
+++ b/sys/dev/mii/luphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: luphy.c,v 1.3 2005/04/15 00:44:39 brad Exp $	*/
+/*	$OpenBSD: luphy.c,v 1.4 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2004 Marius Strobl
@@ -58,8 +58,7 @@ int	luphymatch(struct device *, void *, void *);
 void	luphyattach(struct device *, struct device *, void *);
 
 struct cfattach luphy_ca = {
-	sizeof(struct mii_softc), luphymatch, luphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), luphymatch, luphyattach, mii_phy_detach
 };
 
 struct cfdriver luphy_cd = {
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index ae0712b820b..6e6564299eb 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lxtphy.c,v 1.17 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: lxtphy.c,v 1.18 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: lxtphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -80,8 +80,7 @@ int	lxtphymatch(struct device *, void *, void *);
 void	lxtphyattach(struct device *, struct device *, void *);
 
 struct cfattach lxtphy_ca = {
-	sizeof(struct mii_softc), lxtphymatch, lxtphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), lxtphymatch, lxtphyattach, mii_phy_detach
 };
 
 struct cfdriver lxtphy_cd = {
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index ed5fbdd5980..ca499787b67 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mii_physubr.c,v 1.41 2013/06/25 02:27:44 brad Exp $	*/
+/*	$OpenBSD: mii_physubr.c,v 1.42 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $	*/
 
 /*-
@@ -481,20 +481,6 @@ mii_phy_delete_media(struct mii_softc *sc)
 	ifmedia_delete_instance(&mii->mii_media, sc->mii_inst);
 }
 
-int
-mii_phy_activate(struct device *self, int act)
-{
-	int rv = 0;
-
-	switch (act) {
-	case DVACT_DEACTIVATE:
-		/* Nothing special to do. */
-		break;
-	}
-
-	return (rv);
-}
-
 int
 mii_phy_detach(struct device *self, int flags)
 {
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index c93557e7ba6..6a3c5139355 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: miivar.h,v 1.31 2010/04/20 20:42:16 deraadt Exp $	*/
+/*	$OpenBSD: miivar.h,v 1.32 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: miivar.h,v 1.17 2000/03/06 20:56:57 thorpej Exp $	*/
 
 /*-
@@ -242,7 +242,6 @@ void	mii_pollstat(struct mii_data *);
 void	mii_down(struct mii_data *);
 int	mii_anar(int);
 
-int	mii_phy_activate(struct device *, int);
 int	mii_phy_detach(struct device *, int);
 
 const struct mii_phydesc *mii_phy_match(const struct mii_attach_args *,
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index b5b458bc899..ef99f38cb3b 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mlphy.c,v 1.3 2013/05/28 09:46:06 mikeb Exp $	*/
+/*	$OpenBSD: mlphy.c,v 1.4 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999
@@ -130,8 +130,7 @@ int	mlphy_probe(struct device *, void *, void *);
 void	mlphy_attach(struct device *, struct device *, void *);
 
 struct cfattach mlphy_ca = {
-	sizeof(struct mii_softc), mlphy_probe, mlphy_attach, mii_phy_detach,
-	mii_phy_activate
+	sizeof(struct mii_softc), mlphy_probe, mlphy_attach, mii_phy_detach
 };
 
 struct cfdriver mlphy_cd = {
@@ -185,7 +184,7 @@ mlphy_attach(struct device *parent, struct device *self, void *aux)
 	sc->mii_flags = ma->mii_flags;
 	msc->ml_dev = parent; 
 
-	mii_phy_reset(sc);
+	PHY_RESET(sc);
 
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 #define ADD(m, c)	ifmedia_add(&mii->mii_media, (m), (c), NULL)
diff --git a/sys/dev/mii/mtdphy.c b/sys/dev/mii/mtdphy.c
index c8a2684d8f8..b86b038e352 100644
--- a/sys/dev/mii/mtdphy.c
+++ b/sys/dev/mii/mtdphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtdphy.c,v 1.12 2005/02/19 06:00:04 brad Exp $	*/
+/*	$OpenBSD: mtdphy.c,v 1.13 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Jason L. Wright (jason@thought.net)
@@ -49,8 +49,7 @@ int	mtdphymatch(struct device *, void *, void *);
 void	mtdphyattach(struct device *, struct device *, void *);
 
 struct cfattach mtdphy_ca = {
-	sizeof(struct mii_softc), mtdphymatch, mtdphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), mtdphymatch, mtdphyattach, mii_phy_detach
 };
 
 struct cfdriver mtdphy_cd = {
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 9d52ee42df0..6030cbdc681 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsgphy.c,v 1.22 2009/07/22 10:39:51 sthen Exp $	*/
+/*	$OpenBSD: nsgphy.c,v 1.23 2013/12/28 03:30:41 deraadt Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 2001
@@ -69,8 +69,7 @@ int	nsgphymatch(struct device*, void *, void *);
 void	nsgphyattach(struct device *, struct device *, void *);
 
 struct cfattach nsgphy_ca = {
-	sizeof(struct mii_softc), nsgphymatch, nsgphyattach, mii_phy_detach,
-	mii_phy_activate
+	sizeof(struct mii_softc), nsgphymatch, nsgphyattach, mii_phy_detach
 };
 
 struct cfdriver nsgphy_cd = {
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index acd467c3f10..4de3c7fa86e 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsphy.c,v 1.25 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: nsphy.c,v 1.26 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: nsphy.c,v 1.25 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -80,8 +80,7 @@ int	nsphymatch(struct device *, void *, void *);
 void	nsphyattach(struct device *, struct device *, void *);
 
 struct cfattach nsphy_ca = {
-	sizeof(struct mii_softc), nsphymatch, nsphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), nsphymatch, nsphyattach, mii_phy_detach
 };
 
 struct cfdriver nsphy_cd = {
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 59acc231f7e..a98497344c4 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsphyter.c,v 1.16 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: nsphyter.c,v 1.17 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: nsphyter.c,v 1.5 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -81,7 +81,7 @@ void	nsphyterattach(struct device *, struct device *, void *);
 
 struct cfattach nsphyter_ca = {
 	sizeof(struct mii_softc), nsphytermatch, nsphyterattach,
-	    mii_phy_detach, mii_phy_activate
+	mii_phy_detach
 };
 
 struct cfdriver nsphyter_cd = {
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 1a69cebfd82..d54fb317e87 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qsphy.c,v 1.18 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: qsphy.c,v 1.19 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -79,8 +79,7 @@ int	qsphymatch(struct device *, void *, void *);
 void	qsphyattach(struct device *, struct device *, void *);
 
 struct cfattach qsphy_ca = {
-	sizeof(struct mii_softc), qsphymatch, qsphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), qsphymatch, qsphyattach, mii_phy_detach
 };
 
 struct cfdriver qsphy_cd = {
diff --git a/sys/dev/mii/rdcphy.c b/sys/dev/mii/rdcphy.c
index ab6488be66b..43230ad045c 100644
--- a/sys/dev/mii/rdcphy.c
+++ b/sys/dev/mii/rdcphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdcphy.c,v 1.1 2011/01/15 04:35:34 kevlo Exp $	*/
+/*	$OpenBSD: rdcphy.c,v 1.2 2013/12/28 03:30:41 deraadt Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -107,7 +107,7 @@ static const struct mii_phydesc rdcphys[] = {
 
 struct cfattach rdcphy_ca = {
 	sizeof(struct rdcphy_softc), rdcphy_match, rdcphy_attach,
-	mii_phy_detach, mii_phy_activate
+	mii_phy_detach
 };
 
 struct cfdriver rdcphy_cd = {
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 2c137700afd..f80687ffb78 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rgephy.c,v 1.30 2013/05/28 09:46:06 mikeb Exp $	*/
+/*	$OpenBSD: rgephy.c,v 1.31 2013/12/28 03:30:41 deraadt Exp $	*/
 /*
  * Copyright (c) 2003
  *	Bill Paul <wpaul@windriver.com>.  All rights reserved.
@@ -63,12 +63,8 @@
 int	rgephymatch(struct device *, void *, void *);
 void	rgephyattach(struct device *, struct device *, void *);
 
-struct cfattach rgephy_ca = {
-	sizeof(struct mii_softc),
-	rgephymatch,
-	rgephyattach,
-	mii_phy_detach,
-	mii_phy_activate
+struct cfattach rgephy_ca = { sizeof(struct mii_softc),
+	rgephymatch, rgephyattach, mii_phy_detach,
 };
 
 struct cfdriver rgephy_cd = {
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 50403bf3e45..359ac42e0d8 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlphy.c,v 1.31 2013/06/15 20:31:05 kettenis Exp $	*/
+/*	$OpenBSD: rlphy.c,v 1.32 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Jason L. Wright (jason@thought.net)
@@ -57,8 +57,7 @@ int	rlphymatch(struct device *, void *, void *);
 void	rlphyattach(struct device *, struct device *, void *);
 
 struct cfattach rlphy_ca = {
-	sizeof(struct mii_softc), rlphymatch, rlphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), rlphymatch, rlphyattach, mii_phy_detach
 };
 
 struct cfdriver rlphy_cd = {
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index b4c0684cd06..4422983a3a7 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sqphy.c,v 1.18 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: sqphy.c,v 1.19 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: sqphy.c,v 1.17 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -79,8 +79,7 @@ int	sqphymatch(struct device *, void *, void *);
 void	sqphyattach(struct device *, struct device *, void *);
 
 struct cfattach sqphy_ca = {
-	sizeof(struct mii_softc), sqphymatch, sqphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), sqphymatch, sqphyattach, mii_phy_detach
 };
 
 struct cfdriver sqphy_cd = {
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 225d3b7a0fb..72bee5fba69 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tlphy.c,v 1.20 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: tlphy.c,v 1.21 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: tlphy.c,v 1.26 2000/07/04 03:29:00 thorpej Exp $	*/
 
 /*-
@@ -98,8 +98,7 @@ int	tlphymatch(struct device *, void *, void *);
 void	tlphyattach(struct device *, struct device *, void *);
 
 struct cfattach tlphy_ca = {
-	sizeof(struct tlphy_softc), tlphymatch, tlphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct tlphy_softc), tlphymatch, tlphyattach, mii_phy_detach
 };
 
 int	tlphy_service(struct mii_softc *, struct mii_data *, int);
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index 0f6b85e653a..fbcb8cf0465 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tqphy.c,v 1.15 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: tqphy.c,v 1.16 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: tqphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*
@@ -81,8 +81,7 @@ void	tqphyattach(struct device *, struct device *, void *);
 int	tqphydetach(struct device *, int);
 
 struct cfattach tqphy_ca = {
-	sizeof(struct mii_softc), tqphymatch, tqphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), tqphymatch, tqphyattach, mii_phy_detach
 };
 
 struct cfdriver tqphy_cd = {
diff --git a/sys/dev/mii/txphy.c b/sys/dev/mii/txphy.c
index 4c3f059352f..24c8252785e 100644
--- a/sys/dev/mii/txphy.c
+++ b/sys/dev/mii/txphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: txphy.c,v 1.10 2005/02/19 06:00:04 brad Exp $	*/
+/*	$OpenBSD: txphy.c,v 1.11 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -48,8 +48,7 @@ int	txphymatch(struct device *, void *, void *);
 void	txphyattach(struct device *, struct device *, void *);
 
 struct cfattach txphy_ca = {
-	sizeof(struct mii_softc), txphymatch, txphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), txphymatch, txphyattach, mii_phy_detach
 };
 
 struct cfdriver txphy_cd = {
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 5b411b9218d..0ad045094d4 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukphy.c,v 1.20 2010/07/23 07:47:13 jsg Exp $	*/
+/*	$OpenBSD: ukphy.c,v 1.21 2013/12/28 03:30:41 deraadt Exp $	*/
 /*	$NetBSD: ukphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -76,8 +76,7 @@ int	ukphymatch(struct device *, void *, void *);
 void	ukphyattach(struct device *, struct device *, void *);
 
 struct cfattach ukphy_ca = {
-	sizeof(struct mii_softc), ukphymatch, ukphyattach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), ukphymatch, ukphyattach, mii_phy_detach
 };
 
 struct cfdriver ukphy_cd = {
diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c
index 96a544607b0..9494fbec144 100644
--- a/sys/dev/mii/urlphy.c
+++ b/sys/dev/mii/urlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urlphy.c,v 1.14 2013/05/28 09:46:06 mikeb Exp $ */
+/*	$OpenBSD: urlphy.c,v 1.15 2013/12/28 03:30:41 deraadt Exp $ */
 /*	$NetBSD: urlphy.c,v 1.1 2002/03/28 21:07:53 ichiro Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -62,8 +62,7 @@ int urlphy_match(struct device *, void *, void *);
 void urlphy_attach(struct device *, struct device *, void *);
 
 struct cfattach urlphy_ca = {
-	sizeof(struct mii_softc), urlphy_match, urlphy_attach, mii_phy_detach,
-	mii_phy_activate
+	sizeof(struct mii_softc), urlphy_match, urlphy_attach, mii_phy_detach
 };
 
 struct cfdriver urlphy_cd = {
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 69812fbfb57..051a2ab3fc5 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xmphy.c,v 1.19 2013/05/28 09:46:06 mikeb Exp $	*/
+/*	$OpenBSD: xmphy.c,v 1.20 2013/12/28 03:30:41 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -60,8 +60,7 @@ int xmphy_probe(struct device *, void *, void *);
 void xmphy_attach(struct device *, struct device *, void *);
 
 struct cfattach xmphy_ca = {
-	sizeof(struct mii_softc), xmphy_probe, xmphy_attach, mii_phy_detach,
-	    mii_phy_activate
+	sizeof(struct mii_softc), xmphy_probe, xmphy_attach, mii_phy_detach
 };
 
 struct cfdriver xmphy_cd = {
-- 
2.20.1