diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c index d20c793f864d..39da983cd390 100644 --- a/sys/dev/mii/atphy.c +++ b/sys/dev/mii/atphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: atphy.c,v 1.30 2020/03/15 23:04:50 thorpej Exp $ */ +/* $NetBSD: atphy.c,v 1.31 2023/02/22 08:09:09 msaitoh Exp $ */ /* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */ /*- @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.30 2020/03/15 23:04:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.31 2023/02/22 08:09:09 msaitoh Exp $"); #include #include @@ -323,7 +323,7 @@ done: break; /* Only retry autonegotiation every mii_anegticks seconds. */ - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) break; atphy_mii_phy_auto(sc); diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index e85ef9d928ed..1fd33c126e70 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: brgphy.c,v 1.90 2020/05/25 19:48:38 jmcneill Exp $ */ +/* $NetBSD: brgphy.c,v 1.91 2023/02/22 08:09:09 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.90 2020/05/25 19:48:38 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.91 2023/02/22 08:09:09 msaitoh Exp $"); #include #include @@ -424,7 +424,7 @@ setit: /* Only retry autonegotiation every mii_anegticks seconds. */ KASSERT(sc->mii_anegticks != 0); - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) break; brgphy_mii_phy_auto(sc); diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c index e709e58d97e9..6bd6775ecd96 100644 --- a/sys/dev/mii/ciphy.c +++ b/sys/dev/mii/ciphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ciphy.c,v 1.41 2020/08/24 04:23:41 msaitoh Exp $ */ +/* $NetBSD: ciphy.c,v 1.42 2023/02/22 08:09:09 msaitoh Exp $ */ /*- * Copyright (c) 2004 @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.41 2020/08/24 04:23:41 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.42 2023/02/22 08:09:09 msaitoh Exp $"); /* * Driver for the Cicada CS8201 10/100/1000 copper PHY. @@ -270,7 +270,7 @@ setit: break; /* Only retry autonegotiation every N seconds. */ - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) break; mii_phy_auto_restart(sc); diff --git a/sys/dev/mii/ipgphy.c b/sys/dev/mii/ipgphy.c index 372839ca94f9..54621400c843 100644 --- a/sys/dev/mii/ipgphy.c +++ b/sys/dev/mii/ipgphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipgphy.c,v 1.10 2020/03/15 23:04:50 thorpej Exp $ */ +/* $NetBSD: ipgphy.c,v 1.11 2023/02/22 08:09:09 msaitoh Exp $ */ /* $OpenBSD: ipgphy.c,v 1.19 2015/07/19 06:28:12 yuo Exp $ */ /*- @@ -33,7 +33,7 @@ * Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY. */ #include -__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.10 2020/03/15 23:04:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.11 2023/02/22 08:09:09 msaitoh Exp $"); #include #include @@ -237,7 +237,7 @@ done: break; /* Only retry autonegotiation every mii_anegticks seconds. */ - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) break; sc->mii_ticks = 0; diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c index 9f2f8287aa58..b976303425a2 100644 --- a/sys/dev/mii/jmphy.c +++ b/sys/dev/mii/jmphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: jmphy.c,v 1.4 2020/03/15 23:04:50 thorpej Exp $ */ +/* $NetBSD: jmphy.c,v 1.5 2023/02/22 08:09:09 msaitoh Exp $ */ /* $OpenBSD: jmphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon @@ -174,7 +174,7 @@ jmphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) /* Announce link loss right after it happens. */ if (sc->mii_ticks++ == 0) break; - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) return 0; sc->mii_ticks = 0; diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index f29a8a22bde9..125a3aa1a96f 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: mii_physubr.c,v 1.101 2022/08/23 01:05:50 riastradh Exp $ */ +/* $NetBSD: mii_physubr.c,v 1.102 2023/02/22 08:09:09 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.101 2022/08/23 01:05:50 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.102 2023/02/22 08:09:09 msaitoh Exp $"); #include #include @@ -390,7 +390,7 @@ mii_phy_tick(struct mii_softc *sc) * Only retry autonegotiation every N seconds. */ KASSERT(sc->mii_anegticks != 0); - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) return EJUSTRETURN; if (mii_phy_auto_restart(sc) == EJUSTRETURN) diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c index 9878ce29d839..e3194685cfc3 100644 --- a/sys/dev/mii/tlphy.c +++ b/sys/dev/mii/tlphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: tlphy.c,v 1.71 2020/07/07 08:44:12 msaitoh Exp $ */ +/* $NetBSD: tlphy.c,v 1.72 2023/02/22 08:09:09 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.71 2020/07/07 08:44:12 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.72 2023/02/22 08:09:09 msaitoh Exp $"); #include #include @@ -290,7 +290,7 @@ tlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) /* Only retry autonegotiation every mii_anegticks seconds. */ KASSERT(sc->mii_anegticks != 0); - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) break; tlphy_auto(tsc); diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c index 265b1b28956a..2654b96be307 100644 --- a/sys/dev/mii/urlphy.c +++ b/sys/dev/mii/urlphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: urlphy.c,v 1.39 2022/01/08 17:35:05 riastradh Exp $ */ +/* $NetBSD: urlphy.c,v 1.40 2023/02/22 08:09:09 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE . All rights reserved. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.39 2022/01/08 17:35:05 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.40 2023/02/22 08:09:09 msaitoh Exp $"); #include #include @@ -199,7 +199,7 @@ urlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) /* Only retry autonegotiation every N seconds. */ KASSERT(sc->mii_anegticks != 0); - if (sc->mii_ticks <= sc->mii_anegticks) + if (sc->mii_ticks < sc->mii_anegticks) return 0; if (mii_phy_auto_restart(sc) == EJUSTRETURN)