Module Name: src
Committed By: martin
Date: Sat Jan 29 16:56:18 UTC 2022
Modified Files:
src/sys/dev/mii [netbsd-8]: igphy.c ihphy.c makphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1726):
sys/dev/mii/igphy.c: revision 1.37
sys/dev/mii/ihphy.c: revision 1.19
sys/dev/mii/makphy.c: revision 1.68
Fix a bug that "ifconfig xx0 media none" set LINK_STATE_UNKNOWN instead of
LINK_STATE_DOWN.
XXX We should check for other PHY drivers, too.
To generate a diff of this commit:
cvs rdiff -u -r1.26.10.2 -r1.26.10.3 src/sys/dev/mii/igphy.c
cvs rdiff -u -r1.10.8.3 -r1.10.8.4 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.42.8.5 -r1.42.8.6 src/sys/dev/mii/makphy.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/igphy.c
diff -u src/sys/dev/mii/igphy.c:1.26.10.2 src/sys/dev/mii/igphy.c:1.26.10.3
--- src/sys/dev/mii/igphy.c:1.26.10.2 Wed Aug 5 17:22:46 2020
+++ src/sys/dev/mii/igphy.c Sat Jan 29 16:56:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: igphy.c,v 1.26.10.2 2020/08/05 17:22:46 martin Exp $ */
+/* $NetBSD: igphy.c,v 1.26.10.3 2022/01/29 16:56:18 martin Exp $ */
/*
* The Intel copyright applies to the analog register setup, and the
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.26.10.2 2020/08/05 17:22:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.26.10.3 2022/01/29 16:56:18 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_mii.h"
@@ -443,7 +443,6 @@ igphy_status(struct mii_softc *sc)
bmcr = PHY_READ(sc, MII_BMCR);
if (bmcr & BMCR_ISO) {
mii->mii_media_active |= IFM_NONE;
- mii->mii_media_status = 0;
return;
}
Index: src/sys/dev/mii/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.10.8.3 src/sys/dev/mii/ihphy.c:1.10.8.4
--- src/sys/dev/mii/ihphy.c:1.10.8.3 Sat Nov 20 15:11:32 2021
+++ src/sys/dev/mii/ihphy.c Sat Jan 29 16:56:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.10.8.3 2021/11/20 15:11:32 martin Exp $ */
+/* $NetBSD: ihphy.c,v 1.10.8.4 2022/01/29 16:56:18 martin 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.10.8.3 2021/11/20 15:11:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.10.8.4 2022/01/29 16:56:18 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,7 +244,6 @@ ihphy_status(struct mii_softc *sc)
bmcr = PHY_READ(sc, MII_BMCR);
if (bmcr & (BMCR_ISO | BMCR_PDOWN)) {
mii->mii_media_active |= IFM_NONE;
- mii->mii_media_status = 0;
return;
}
Index: src/sys/dev/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.42.8.5 src/sys/dev/mii/makphy.c:1.42.8.6
--- src/sys/dev/mii/makphy.c:1.42.8.5 Wed Aug 5 17:22:46 2020
+++ src/sys/dev/mii/makphy.c Sat Jan 29 16:56:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.42.8.5 2020/08/05 17:22:46 martin Exp $ */
+/* $NetBSD: makphy.c,v 1.42.8.6 2022/01/29 16:56:18 martin 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.42.8.5 2020/08/05 17:22:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.42.8.6 2022/01/29 16:56:18 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -475,9 +475,8 @@ makphy_status(struct mii_softc *sc)
if (bmcr & BMCR_LOOP)
mii->mii_media_active |= IFM_LOOP;
- if (bmcr & BMCR_ISO) {
+ if (bmcr & (BMCR_ISO | BMCR_PDOWN)) {
mii->mii_media_active |= IFM_NONE;
- mii->mii_media_status = 0;
return;
}
