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

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

details:   https://anonhg.NetBSD.org/src/rev/723e8c6c1ce4
branches:  netbsd-8
changeset: 460855:723e8c6c1ce4
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 06 09:55:15 2019 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1426):

        sys/dev/mii/ukphy_subr.c: revision 1.16

Fix a bug that ukphy_status() misunderstand master mode.

diffstat:

 sys/dev/mii/ukphy_subr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 3d8c3ef30480 -r 723e8c6c1ce4 sys/dev/mii/ukphy_subr.c
--- a/sys/dev/mii/ukphy_subr.c  Mon Nov 04 14:50:32 2019 +0000
+++ b/sys/dev/mii/ukphy_subr.c  Wed Nov 06 09:55:15 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ukphy_subr.c,v 1.13 2014/06/16 16:48:16 msaitoh Exp $  */
+/*     $NetBSD: ukphy_subr.c,v 1.13.20.1 2019/11/06 09:55:15 martin Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy_subr.c,v 1.13 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy_subr.c,v 1.13.20.1 2019/11/06 09:55:15 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -116,7 +116,7 @@
                else
                        mii->mii_media_active |= IFM_NONE;
 
-               if ((mii->mii_media_active & IFM_1000_T) &&
+               if ((IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T) &&
                    (gtsr & GTSR_MS_RES))
                        mii->mii_media_active |= IFM_ETH_MASTER;