Module Name: src
Committed By: pooka
Date: Thu Jan 20 14:26:11 UTC 2011
Modified Files:
src/sys/dev/mii: rlphy.c
Log Message:
Match only first instance of rlphy, following suite from Free/OpenBSD.
should fix PR kern/42950, variant of patch from "js" on irc
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/mii/rlphy.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/mii/rlphy.c
diff -u src/sys/dev/mii/rlphy.c:1.26 src/sys/dev/mii/rlphy.c:1.27
--- src/sys/dev/mii/rlphy.c:1.26 Sun Nov 14 13:40:36 2010
+++ src/sys/dev/mii/rlphy.c Thu Jan 20 14:26:11 2011
@@ -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);
