Module Name: src Committed By: martin Date: Thu Jan 31 05:59:55 UTC 2019
Modified Files: src/sys/dev/mii [netbsd-8]: rgephy.c urlphy.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1177): sys/dev/mii/rgephy.c: revision 1.45 sys/dev/mii/urlphy.c: revision 1.32 Pass flags correctly. See also: http://mail-index.netbsd.org/source-changes/2002/03/25/msg100515.html To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.10.1 src/sys/dev/mii/rgephy.c cvs rdiff -u -r1.31 -r1.31.10.1 src/sys/dev/mii/urlphy.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/rgephy.c diff -u src/sys/dev/mii/rgephy.c:1.40 src/sys/dev/mii/rgephy.c:1.40.10.1 --- src/sys/dev/mii/rgephy.c:1.40 Fri Aug 21 12:22:22 2015 +++ src/sys/dev/mii/rgephy.c Thu Jan 31 05:59:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rgephy.c,v 1.40 2015/08/21 12:22:22 jmcneill Exp $ */ +/* $NetBSD: rgephy.c,v 1.40.10.1 2019/01/31 05:59:55 martin Exp $ */ /* * Copyright (c) 2003 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.40 2015/08/21 12:22:22 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.40.10.1 2019/01/31 05:59:55 martin Exp $"); /* @@ -131,7 +131,7 @@ rgephy_attach(device_t parent, device_t sc->mii_mpd_model = MII_MODEL(ma->mii_id2); sc->mii_mpd_rev = MII_REV(ma->mii_id2); sc->mii_pdata = mii; - sc->mii_flags = mii->mii_flags; + sc->mii_flags = ma->mii_flags; sc->mii_anegticks = MII_ANEGTICKS_GIGE; sc->mii_funcs = &rgephy_funcs; Index: src/sys/dev/mii/urlphy.c diff -u src/sys/dev/mii/urlphy.c:1.31 src/sys/dev/mii/urlphy.c:1.31.10.1 --- src/sys/dev/mii/urlphy.c:1.31 Thu Jul 7 06:55:41 2016 +++ src/sys/dev/mii/urlphy.c Thu Jan 31 05:59:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: urlphy.c,v 1.31 2016/07/07 06:55:41 msaitoh Exp $ */ +/* $NetBSD: urlphy.c,v 1.31.10.1 2019/01/31 05:59:55 martin Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE <n...@nabechan.org>. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.31 2016/07/07 06:55:41 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.31.10.1 2019/01/31 05:59:55 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,7 +110,7 @@ urlphy_attach(device_t parent, device_t sc->mii_phy = ma->mii_phyno; sc->mii_funcs = &urlphy_funcs; sc->mii_pdata = mii; - sc->mii_flags = mii->mii_flags; + sc->mii_flags = ma->mii_flags; sc->mii_anegticks = MII_ANEGTICKS_GIGE; /* Don't do loopback on this PHY. */