Module Name: src Committed By: martin Date: Wed Nov 6 09:53:59 UTC 2019
Modified Files: src/sys/dev/mii [netbsd-9]: ukphy_subr.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #402): sys/dev/mii/ukphy_subr.c: revision 1.16 Fix a bug that ukphy_status() misunderstand master mode. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/dev/mii/ukphy_subr.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/ukphy_subr.c diff -u src/sys/dev/mii/ukphy_subr.c:1.15 src/sys/dev/mii/ukphy_subr.c:1.15.4.1 --- src/sys/dev/mii/ukphy_subr.c:1.15 Mon Mar 25 09:20:46 2019 +++ src/sys/dev/mii/ukphy_subr.c Wed Nov 6 09:53:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ukphy_subr.c,v 1.15 2019/03/25 09:20:46 msaitoh Exp $ */ +/* $NetBSD: ukphy_subr.c,v 1.15.4.1 2019/11/06 09:53:59 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.15 2019/03/25 09:20:46 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukphy_subr.c,v 1.15.4.1 2019/11/06 09:53:59 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -119,7 +119,7 @@ ukphy_status(struct mii_softc *phy) 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;