[src/trunk]: src/sys/dev/mii Don't check BNX_CHIP_NUM. Check MII PHY ID becau...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1ac4b5a66aa7
branches:  trunk
changeset: 330286:1ac4b5a66aa7
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jul 02 22:01:44 2014 +0000

description:
Don't check BNX_CHIP_NUM. Check MII PHY ID because this check is used
for both bge(4) and bnx(4).

diffstat:

 sys/dev/mii/brgphy.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 1571a9b994bf -r 1ac4b5a66aa7 sys/dev/mii/brgphy.c
--- a/sys/dev/mii/brgphy.c      Wed Jul 02 21:51:36 2014 +0000
+++ b/sys/dev/mii/brgphy.c      Wed Jul 02 22:01:44 2014 +0000
@@ -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 @@
        }
 
        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;