Module Name: src
Committed By: msaitoh
Date: Sun Jun 9 08:42:16 UTC 2013
Modified Files:
src/sys/dev/mii: atphy.c ciphy.c ihphy.c rgephy.c
Log Message:
atphy, ciphy, ihphy and rgephy are gigabit PHY, so not only check IFM_AUTO
for autonegotiation but also check IFM_1000_T, too.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/mii/rgephy.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.13 src/sys/dev/mii/atphy.c:1.14
--- src/sys/dev/mii/atphy.c:1.13 Thu Jun 6 03:10:48 2013
+++ src/sys/dev/mii/atphy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.13 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: atphy.c,v 1.14 2013/06/09 08:42:16 msaitoh 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.13 2013/06/06 03:10:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.14 2013/06/09 08:42:16 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -264,7 +264,8 @@ done:
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
+ if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+ (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T)) {
sc->mii_ticks = 0;
break;
}
Index: src/sys/dev/mii/ciphy.c
diff -u src/sys/dev/mii/ciphy.c:1.20 src/sys/dev/mii/ciphy.c:1.21
--- src/sys/dev/mii/ciphy.c:1.20 Thu Jun 6 03:10:48 2013
+++ src/sys/dev/mii/ciphy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.20 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.20 2013/06/06 03:10:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.21 2013/06/09 08:42:16 msaitoh Exp $");
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -257,7 +257,8 @@ setit:
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+ if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+ (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T))
break;
/*
Index: src/sys/dev/mii/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.2 src/sys/dev/mii/ihphy.c:1.3
--- src/sys/dev/mii/ihphy.c:1.2 Fri May 20 06:06:59 2011
+++ src/sys/dev/mii/ihphy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.2 2011/05/20 06:06:59 msaitoh Exp $ */
+/* $NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh 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.2 2011/05/20 06:06:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -217,7 +217,8 @@ ihphy_service(struct mii_softc *sc, stru
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+ if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+ (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T))
return 0;
if (mii_phy_tick(sc) == EJUSTRETURN)
Index: src/sys/dev/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.30 src/sys/dev/mii/rgephy.c:1.31
--- src/sys/dev/mii/rgephy.c:1.30 Thu Jun 6 03:10:48 2013
+++ src/sys/dev/mii/rgephy.c Sun Jun 9 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.30 2013/06/06 03:10:48 msaitoh Exp $ */
+/* $NetBSD: rgephy.c,v 1.31 2013/06/09 08:42:16 msaitoh Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.30 2013/06/06 03:10:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.31 2013/06/09 08:42:16 msaitoh Exp $");
/*
@@ -288,7 +288,8 @@ rgephy_service(struct mii_softc *sc, str
/*
* Only used for autonegotiation.
*/
- if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+ if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) &&
+ (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T))
break;
/*
