Module Name: src
Committed By: riz
Date: Wed Jul 4 19:43:10 UTC 2012
Modified Files:
src/share/man/man4 [netbsd-6]: hme.4
src/sys/dev/ic [netbsd-6]: hme.c
Log Message:
Pull up following revision(s) (requested by jdc in ticket #368):
sys/dev/ic/hme.c: revision 1.88
share/man/man4/hme.4: revision 1.10
PR kern/46424
Revert the part of revision 1.77 that altered the PHY attachment order.
Note that the PHY instance changes when a MII transceiver is connected.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 src/share/man/man4/hme.4
cvs rdiff -u -r1.87 -r1.87.2.1 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/share/man/man4/hme.4
diff -u src/share/man/man4/hme.4:1.9 src/share/man/man4/hme.4:1.9.10.1
--- src/share/man/man4/hme.4:1.9 Fri Jan 15 19:24:49 2010
+++ src/share/man/man4/hme.4 Wed Jul 4 19:43:10 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: hme.4,v 1.9 2010/01/15 19:24:49 joerg Exp $
+.\" $NetBSD: hme.4,v 1.9.10.1 2012/07/04 19:43:10 riz Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 28, 2008
+.Dd June 23, 2012
.Dt HME 4
.Os
.Sh NAME
@@ -108,3 +108,7 @@ The
driver was written by
.An Paul Kranenburg
.Aq [email protected] .
+.Sh BUGS
+Connecting a MII transceiver on those cards that support it will cause the
+RJ45 connector to be detected as PHY instance 1, instead of the default
+instance 0.
Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.87 src/sys/dev/ic/hme.c:1.87.2.1
--- src/sys/dev/ic/hme.c:1.87 Thu Feb 2 19:43:03 2012
+++ src/sys/dev/ic/hme.c Wed Jul 4 19:43:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.87 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: hme.c,v 1.87.2.1 2012/07/04 19:43:10 riz 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.87.2.1 2012/07/04 19:43:10 riz 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) {
