Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retry autonegotiation every mii_anegticks seconds instead of mii_anegticks+1.

This commit is contained in:
msaitoh 2023-02-22 08:09:09 +00:00
parent 38747e2407
commit 9589449d9e
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/mii/atphy.c
View File

@ -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 <sys/cdefs.h>
__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 <sys/param.h>
#include <sys/systm.h>
@ -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);

6
sys/dev/mii/brgphy.c
View File

@ -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 <sys/cdefs.h>
__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 <sys/param.h>
#include <sys/systm.h>
@ -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);

6
sys/dev/mii/ciphy.c
View File

@ -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 <sys/cdefs.h>
__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);

6
sys/dev/mii/ipgphy.c
View File

@ -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 <sys/cdefs.h>
__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 <sys/param.h>
#include <sys/systm.h>
@ -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;

4
sys/dev/mii/jmphy.c
View File

@ -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 <yongari@FreeBSD.org>
@ -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;

6
sys/dev/mii/mii_physubr.c
View File

@ -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 <sys/cdefs.h>
__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 <sys/param.h>
#include <sys/device.h>
@ -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)

6
sys/dev/mii/tlphy.c
View File

@ -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 <sys/cdefs.h>
__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 <sys/param.h>
#include <sys/systm.h>
@ -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);

6
sys/dev/mii/urlphy.c
View File

@ -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 <nabe@nabechan.org>. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__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 <sys/param.h>
#include <sys/systm.h>
@ -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)