Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/mii Match only first instance of rlphy, following su...



details:   https://anonhg.NetBSD.org/src/rev/56fbb4b68cae
branches:  trunk
changeset: 761199:56fbb4b68cae
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Jan 20 14:26:11 2011 +0000

description:
Match only first instance of rlphy, following suite from Free/OpenBSD.

should fix PR kern/42950, variant of patch from "js" on irc

diffstat:

 sys/dev/mii/rlphy.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 453762368cb9 -r 56fbb4b68cae sys/dev/mii/rlphy.c
--- a/sys/dev/mii/rlphy.c       Thu Jan 20 11:59:24 2011 +0000
+++ b/sys/dev/mii/rlphy.c       Thu Jan 20 14:26:11 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rlphy.c,v 1.26 2010/11/14 13:40:36 mlelstv Exp $       */
+/*     $NetBSD: rlphy.c,v 1.27 2011/01/20 14:26:11 pooka Exp $ */
 /*     $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $     */
 
 /*
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.26 2010/11/14 13:40:36 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.27 2011/01/20 14:26:11 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,6 +90,10 @@
 rlphymatch(device_t parent, cfdata_t match, void *aux)
 {
        struct mii_attach_args *ma = aux;
+       struct mii_data *mii = ma->mii_data;
+
+       if (mii->mii_instance != 0)
+               return 0;
 
        if (mii_phy_match(ma, rlphys) != NULL)
                return (10);



Home | Main Index | Thread Index | Old Index