[src/netbsd-7]: src/sys/dev/mii Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/db73c5fa7f07
branches:  netbsd-7
changeset: 800046:db73c5fa7f07
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Dec 12 07:04:31 2016 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1301):
        sys/dev/mii/inphy.c: revision 1.55
        sys/dev/mii/makphy.c: revision 1.42
        sys/dev/mii/ikphy.c: revision 1.12
        sys/dev/mii/atphy.c: revision 1.18
        sys/dev/mii/ihphy.c: revision 1.10
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,rev}.

diffstat:

 sys/dev/mii/atphy.c  |  7 +++++--
 sys/dev/mii/ihphy.c  |  7 +++++--
 sys/dev/mii/ikphy.c  |  7 +++++--
 sys/dev/mii/inphy.c  |  7 +++++--
 sys/dev/mii/makphy.c |  6 ++++--
 5 files changed, 24 insertions(+), 10 deletions(-)

diffs (140 lines):

diff -r 59800eb031f1 -r db73c5fa7f07 sys/dev/mii/atphy.c
--- a/sys/dev/mii/atphy.c       Fri Dec 09 05:41:31 2016 +0000
+++ b/sys/dev/mii/atphy.c       Mon Dec 12 07:04:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atphy.c,v 1.16.2.1 2015/11/04 18:19:58 riz Exp $ */
+/*     $NetBSD: atphy.c,v 1.16.2.2 2016/12/12 07:04:31 snj Exp $ */
 /*     $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $  */
 
 /*-
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.16.2.1 2015/11/04 18:19:58 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.16.2.2 2016/12/12 07:04:31 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -146,6 +146,9 @@
        sc->mii_dev = self;
        sc->mii_inst = mii->mii_instance;
        sc->mii_phy = ma->mii_phyno;
+       sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+       sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+       sc->mii_mpd_rev = MII_REV(ma->mii_id2);
        sc->mii_funcs = &atphy_funcs;
        sc->mii_pdata = mii;
        sc->mii_flags = ma->mii_flags;
diff -r 59800eb031f1 -r db73c5fa7f07 sys/dev/mii/ihphy.c
--- a/sys/dev/mii/ihphy.c       Fri Dec 09 05:41:31 2016 +0000
+++ b/sys/dev/mii/ihphy.c       Mon Dec 12 07:04:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $        */
+/*     $NetBSD: ihphy.c,v 1.8.2.1 2016/12/12 07:04:31 snj Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.8.2.1 2016/12/12 07:04:31 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -132,6 +132,9 @@
        sc->mii_dev = self;
        sc->mii_inst = mii->mii_instance;
        sc->mii_phy = ma->mii_phyno;
+       sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+       sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+       sc->mii_mpd_rev = MII_REV(ma->mii_id2);
        sc->mii_funcs = &ihphy_funcs;
        sc->mii_pdata = mii;
        sc->mii_flags = ma->mii_flags;
diff -r 59800eb031f1 -r db73c5fa7f07 sys/dev/mii/ikphy.c
--- a/sys/dev/mii/ikphy.c       Fri Dec 09 05:41:31 2016 +0000
+++ b/sys/dev/mii/ikphy.c       Mon Dec 12 07:04:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $       */
+/*     $NetBSD: ikphy.c,v 1.10.2.1 2016/12/12 07:04:31 snj Exp $       */
 
 /*******************************************************************************
 Copyright (c) 2001-2005, Intel Corporation 
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.10.2.1 2016/12/12 07:04:31 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -125,6 +125,9 @@
        sc->mii_dev = self;
        sc->mii_inst = mii->mii_instance;
        sc->mii_phy = ma->mii_phyno;
+       sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+       sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+       sc->mii_mpd_rev = MII_REV(ma->mii_id2);
        sc->mii_funcs = &ikphy_funcs;
        sc->mii_pdata = mii;
        sc->mii_flags = ma->mii_flags;
diff -r 59800eb031f1 -r db73c5fa7f07 sys/dev/mii/inphy.c
--- a/sys/dev/mii/inphy.c       Fri Dec 09 05:41:31 2016 +0000
+++ b/sys/dev/mii/inphy.c       Mon Dec 12 07:04:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $       */
+/*     $NetBSD: inphy.c,v 1.53.2.1 2016/12/12 07:04:31 snj Exp $       */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.53.2.1 2016/12/12 07:04:31 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,6 +137,9 @@
        sc->mii_dev = self;
        sc->mii_inst = mii->mii_instance;
        sc->mii_phy = ma->mii_phyno;
+       sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+       sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+       sc->mii_mpd_rev = MII_REV(ma->mii_id2);
        sc->mii_funcs = &inphy_funcs;
        sc->mii_pdata = mii;
        sc->mii_flags = ma->mii_flags;
diff -r 59800eb031f1 -r db73c5fa7f07 sys/dev/mii/makphy.c
--- a/sys/dev/mii/makphy.c      Fri Dec 09 05:41:31 2016 +0000
+++ b/sys/dev/mii/makphy.c      Mon Dec 12 07:04:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makphy.c,v 1.40 2014/06/16 16:48:16 msaitoh Exp $      */
+/*     $NetBSD: makphy.c,v 1.40.2.1 2016/12/12 07:04:31 snj Exp $      */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.40 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.40.2.1 2016/12/12 07:04:31 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -154,7 +154,9 @@
        aprint_normal(": %s, rev. %d\n", mpd->mpd_name, MII_REV(ma->mii_id2));
 
        sc->mii_dev = self;
+       sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
        sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+       sc->mii_mpd_rev = MII_REV(ma->mii_id2);
        sc->mii_inst = mii->mii_instance;
        sc->mii_phy = ma->mii_phyno;
        sc->mii_funcs = &makphy_funcs;