Module Name: src
Committed By: bouyer
Date: Sun Nov 15 17:45:50 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-6-0]: atphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1325):
sys/dev/mii/atphy.c: revision 1.17
Fix incorrect argument of mii_anar(). Fixes PR#50206.
XXX pullup -[567]
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.12.1 src/sys/dev/mii/atphy.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/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.11 src/sys/dev/mii/atphy.c:1.11.12.1
--- src/sys/dev/mii/atphy.c:1.11 Sun Oct 2 21:42:19 2011
+++ src/sys/dev/mii/atphy.c Sun Nov 15 17:45:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.11 2011/10/02 21:42:19 jmcneill Exp $ */
+/* $NetBSD: atphy.c,v 1.11.12.1 2015/11/15 17:45:50 bouyer 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.11 2011/10/02 21:42:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.11.12.1 2015/11/15 17:45:50 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,7 +226,7 @@ atphy_service(struct mii_softc *sc, stru
return EINVAL;
}
- anar = mii_anar(ife->ifm_media);
+ anar = mii_anar(IFM_SUBTYPE(ife->ifm_media));
if (((ife->ifm_media & IFM_GMASK) & IFM_FDX) != 0) {
bmcr |= BMCR_FDX;
/* Enable pause. */
