Module Name: src
Committed By: jdc
Date: Sun Jun 24 09:37:28 UTC 2012
Modified Files:
src/sys/dev/ic: hme.c
Log Message:
PR kern/46424
Revert the part of revision 1.77 that altered the PHY attachment order.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/ic/hme.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.87 src/sys/dev/ic/hme.c:1.88
--- src/sys/dev/ic/hme.c:1.87 Thu Feb 2 19:43:03 2012
+++ src/sys/dev/ic/hme.c Sun Jun 24 09:37:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.87 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: hme.c,v 1.88 2012/06/24 09:37:28 jdc Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.87 2012/02/02 19:43:03 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.88 2012/06/24 09:37:28 jdc Exp $");
/* #define HMEDEBUG */
@@ -254,15 +254,8 @@ hme_config(struct hme_softc *sc)
hme_mifinit(sc);
- /*
- * Some HME's have an MII connector, as well as RJ45. Try attaching
- * the RJ45 (internal) PHY first, so that the MII PHY is always
- * instance 1.
- */
- mii_attach(sc->sc_dev, mii, 0xffffffff,
- HME_PHYAD_INTERNAL, MII_OFFSET_ANY, MIIF_FORCEANEG);
mii_attach(sc->sc_dev, mii, 0xffffffff,
- HME_PHYAD_EXTERNAL, MII_OFFSET_ANY, MIIF_FORCEANEG);
+ MII_PHY_ANY, MII_OFFSET_ANY, MIIF_FORCEANEG);
child = LIST_FIRST(&mii->mii_phys);
if (child == NULL) {
