Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/mii Retry autonegotiation every mii_anegticks second...
details: https://anonhg.NetBSD.org/src/rev/93708c890cb9
branches: trunk
changeset: 373612:93708c890cb9
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Wed Feb 22 08:09:09 2023 +0000
description:
Retry autonegotiation every mii_anegticks seconds instead of mii_anegticks+1.
diffstat:
sys/dev/mii/atphy.c | 6 +++---
sys/dev/mii/brgphy.c | 6 +++---
sys/dev/mii/ciphy.c | 6 +++---
sys/dev/mii/ipgphy.c | 6 +++---
sys/dev/mii/jmphy.c | 4 ++--
sys/dev/mii/mii_physubr.c | 6 +++---
sys/dev/mii/tlphy.c | 6 +++---
sys/dev/mii/urlphy.c | 6 +++---
8 files changed, 23 insertions(+), 23 deletions(-)
diffs (207 lines):
diff -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/atphy.c
--- a/sys/dev/mii/atphy.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/atphy.c Wed Feb 22 08:09:09 2023 +0000
@@ -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 @@
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 -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/brgphy.c
--- a/sys/dev/mii/brgphy.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/brgphy.c Wed Feb 22 08:09:09 2023 +0000
@@ -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 @@
/* 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 -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/ciphy.c
--- a/sys/dev/mii/ciphy.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/ciphy.c Wed Feb 22 08:09:09 2023 +0000
@@ -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 @@
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 -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/ipgphy.c
--- a/sys/dev/mii/ipgphy.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/ipgphy.c Wed Feb 22 08:09:09 2023 +0000
@@ -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 @@
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 -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/jmphy.c
--- a/sys/dev/mii/jmphy.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/jmphy.c Wed Feb 22 08:09:09 2023 +0000
@@ -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@localhost>
@@ -174,7 +174,7 @@
/* 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 -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/mii_physubr.c
--- a/sys/dev/mii/mii_physubr.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/mii_physubr.c Wed Feb 22 08:09:09 2023 +0000
@@ -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 @@
* 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 -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/tlphy.c
--- a/sys/dev/mii/tlphy.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/tlphy.c Wed Feb 22 08:09:09 2023 +0000
@@ -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 @@
/* 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 -r 36371b477e1a -r 93708c890cb9 sys/dev/mii/urlphy.c
--- a/sys/dev/mii/urlphy.c Tue Feb 21 22:13:02 2023 +0000
+++ b/sys/dev/mii/urlphy.c Wed Feb 22 08:09:09 2023 +0000
@@ -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@localhost>. 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 @@
/* 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)
Home |
Main Index |
Thread Index |
Old Index