diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2013-06-09 09:15:51 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2013-06-09 09:15:51 +0000 |
| commit | bb7eb98ca117b1e11bc9803ed1cf1fde5f049a55 (patch) | |
| tree | c18e17b1554b8ce7dcc9b4ad2160d55905412ef8 /sys/dev | |
| parent | db1c5629120e8bb85fa177373e1cf938f65de79a (diff) | |
Don't "return" but "break" in MII_TICK when the interface isn't doing
autonegotiaton or the link is up to update the status.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mii/exphy.c | 6 | ||||
| -rw-r--r-- | sys/dev/mii/ihphy.c | 6 | ||||
| -rw-r--r-- | sys/dev/mii/tlphy.c | 14 | ||||
| -rw-r--r-- | sys/dev/mii/ukphy.c | 6 | ||||
| -rw-r--r-- | sys/dev/mii/urlphy.c | 8 | ||||
| -rw-r--r-- | sys/dev/sbus/be.c | 14 |
6 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index 2400cc8c9d6..df950d634be 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: exphy.c,v 1.52 2009/10/19 18:41:13 bouyer Exp $ */ +/* $NetBSD: exphy.c,v 1.53 2013/06/09 09:15:51 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.52 2009/10/19 18:41:13 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.53 2013/06/09 09:15:51 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -180,7 +180,7 @@ exphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) - return (0); + break; if (mii_phy_tick(sc) == EJUSTRETURN) return (0); diff --git a/sys/dev/mii/ihphy.c b/sys/dev/mii/ihphy.c index 4c817927999..bccbafd0bed 100644 --- a/sys/dev/mii/ihphy.c +++ b/sys/dev/mii/ihphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ihphy.c,v 1.3 2013/06/09 08:42:16 msaitoh Exp $ */ +/* $NetBSD: ihphy.c,v 1.4 2013/06/09 09:15:51 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.3 2013/06/09 08:42:16 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.4 2013/06/09 09:15:51 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -219,7 +219,7 @@ ihphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) */ if ((IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) && (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T)) - return 0; + break; if (mii_phy_tick(sc) == EJUSTRETURN) return 0; diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c index f05b95fb844..0799d87cdf4 100644 --- a/sys/dev/mii/tlphy.c +++ b/sys/dev/mii/tlphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: tlphy.c,v 1.59 2009/10/19 18:41:14 bouyer Exp $ */ +/* $NetBSD: tlphy.c,v 1.60 2013/06/09 09:15:51 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.59 2009/10/19 18:41:14 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.60 2013/06/09 09:15:51 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -261,16 +261,16 @@ tlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) return (0); /* - * Only used for autonegotiation. + * Is the interface even up? */ - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) + if ((mii->mii_ifp->if_flags & IFF_UP) == 0) return (0); /* - * Is the interface even up? + * Only used for autonegotiation. */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); + if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) + break; /* * XXX WHAT ABOUT CHECKING LINK ON THE BNC/AUI?! diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c index e64ea3ccdb9..4778a11fa53 100644 --- a/sys/dev/mii/ukphy.c +++ b/sys/dev/mii/ukphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukphy.c,v 1.43 2010/06/06 18:58:22 pgoyette Exp $ */ +/* $NetBSD: ukphy.c,v 1.44 2013/06/09 09:15:51 msaitoh Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.43 2010/06/06 18:58:22 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.44 2013/06/09 09:15:51 msaitoh Exp $"); #include "opt_mii.h" @@ -192,7 +192,7 @@ ukphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) - return (0); + break; if (mii_phy_tick(sc) == EJUSTRETURN) return (0); diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c index c955efaf60d..78bc72f6eb4 100644 --- a/sys/dev/mii/urlphy.c +++ b/sys/dev/mii/urlphy.c @@ -1,4 +1,4 @@ -/* $NetBSD: urlphy.c,v 1.26 2013/06/06 03:10:48 msaitoh Exp $ */ +/* $NetBSD: urlphy.c,v 1.27 2013/06/09 09:15:51 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.26 2013/06/06 03:10:48 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.27 2013/06/09 09:15:51 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -182,12 +182,12 @@ urlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) * changes. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) - return (0); + break; /* Read the status register twice; MSR_LINK is latch-low. */ reg = PHY_READ(sc, URLPHY_MSR) | PHY_READ(sc, URLPHY_MSR); if (reg & URLPHY_MSR_LINK) - return (0); + break; /* * Only retry autonegotiation every N seconds. diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c index d680558fce6..eea6fa26d14 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $NetBSD: be.c,v 1.79 2012/07/22 14:33:05 matt Exp $ */ +/* $NetBSD: be.c,v 1.80 2013/06/09 09:23:35 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.79 2012/07/22 14:33:05 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.80 2013/06/09 09:23:35 msaitoh Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -1516,14 +1516,14 @@ be_intphy_service(struct be_softc *sc, struct mii_data *mii, int cmd) if (IFM_INST(ife->ifm_media) != sc->sc_mii_inst) return 0; - /* Only used for automatic media selection */ - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) - return 0; - /* Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) return 0; + /* Only used for automatic media selection */ + if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) + break; + /* * Check link status; if we don't have a link, try another * speed. We can't detect duplex mode, so half-duplex is @@ -1555,7 +1555,7 @@ be_intphy_service(struct be_softc *sc, struct mii_data *mii, int cmd) device_xname(self), (bmcr & BMCR_S100) ? "100" : "10"); } - return 0; + break; } if ((sc->sc_mii_flags & MIIF_DOINGAUTO) == 0) { |
