Module Name: src
Committed By: msaitoh
Date: Wed Jul 2 22:01:44 UTC 2014
Modified Files:
src/sys/dev/mii: brgphy.c
Log Message:
Don't check BNX_CHIP_NUM. Check MII PHY ID beacause this check is used
for both bge(4) and bnx(4).
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/mii/brgphy.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/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.73 src/sys/dev/mii/brgphy.c:1.74
--- src/sys/dev/mii/brgphy.c:1.73 Wed Jul 2 21:51:36 2014
+++ src/sys/dev/mii/brgphy.c Wed Jul 2 22:01:44 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.73 2014/07/02 21:51:36 msaitoh Exp $ */
+/* $NetBSD: brgphy.c,v 1.74 2014/07/02 22:01:44 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.73 2014/07/02 21:51:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.74 2014/07/02 22:01:44 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -311,9 +311,11 @@ brgphyattach(device_t parent, device_t s
}
if (sc->mii_flags & MIIF_HAVEFIBER) {
- if (_BNX_CHIP_NUM(bsc->sc_chipid) == BNX_CHIP_NUM_5708)
+ if ((sc->mii_mpd_oui == MII_OUI_BROADCOM2)
+ && sc->mii_mpd_model == MII_MODEL_BROADCOM2_BCM5708S)
sc->mii_funcs = &brgphy_5708s_funcs;
- else if (_BNX_CHIP_NUM(bsc->sc_chipid) == BNX_CHIP_NUM_5709)
+ else if ((sc->mii_mpd_oui == MII_OUI_BROADCOM2)
+ && (sc->mii_mpd_model == MII_MODEL_BROADCOM2_BCM5709S))
sc->mii_funcs = &brgphy_5709s_funcs;
else
sc->mii_funcs = &brgphy_fiber_funcs;
