Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Don't "return" but "break" in MII_TICK when the inte...
details: https://anonhg.NetBSD.org/src/rev/890d8213f7bb
branches: trunk
changeset: 787281:890d8213f7bb
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Sun Jun 09 09:15:51 2013 +0000
description:
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:
sys/dev/mii/exphy.c | 6 +++---
sys/dev/mii/ihphy.c | 6 +++---
sys/dev/mii/tlphy.c | 16 ++++++++--------
sys/dev/mii/ukphy.c | 6 +++---
sys/dev/mii/urlphy.c | 8 ++++----
sys/dev/sbus/be.c | 14 +++++++-------
6 files changed, 28 insertions(+), 28 deletions(-)
diffs (203 lines):
diff -r 3d11b8b305ed -r 890d8213f7bb sys/dev/mii/exphy.c
--- a/sys/dev/mii/exphy.c Sun Jun 09 08:45:32 2013 +0000
+++ b/sys/dev/mii/exphy.c Sun Jun 09 09:15:51 2013 +0000
@@ -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 @@
* Only used for autonegotiation.
*/
if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
- return (0);
+ break;
if (mii_phy_tick(sc) == EJUSTRETURN)
return (0);
diff -r 3d11b8b305ed -r 890d8213f7bb sys/dev/mii/ihphy.c
--- a/sys/dev/mii/ihphy.c Sun Jun 09 08:45:32 2013 +0000
+++ b/sys/dev/mii/ihphy.c Sun Jun 09 09:15:51 2013 +0000
@@ -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 @@
*/
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 -r 3d11b8b305ed -r 890d8213f7bb sys/dev/mii/tlphy.c
--- a/sys/dev/mii/tlphy.c Sun Jun 09 08:45:32 2013 +0000
+++ b/sys/dev/mii/tlphy.c Sun Jun 09 09:15:51 2013 +0000
@@ -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,18 +261,18 @@
return (0);
/*
- * Only used for autonegotiation.
- */
- 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 autonegotiation.
+ */
+ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
+ break;
+
+ /*
* XXX WHAT ABOUT CHECKING LINK ON THE BNC/AUI?!
*/
diff -r 3d11b8b305ed -r 890d8213f7bb sys/dev/mii/ukphy.c
--- a/sys/dev/mii/ukphy.c Sun Jun 09 08:45:32 2013 +0000
+++ b/sys/dev/mii/ukphy.c Sun Jun 09 09:15:51 2013 +0000
@@ -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 @@
* Only used for autonegotiation.
*/
if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO)
- return (0);
+ break;
if (mii_phy_tick(sc) == EJUSTRETURN)
return (0);
diff -r 3d11b8b305ed -r 890d8213f7bb sys/dev/mii/urlphy.c
--- a/sys/dev/mii/urlphy.c Sun Jun 09 08:45:32 2013 +0000
+++ b/sys/dev/mii/urlphy.c Sun Jun 09 09:15:51 2013 +0000
@@ -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@localhost>. 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 @@
* 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 -r 3d11b8b305ed -r 890d8213f7bb sys/dev/sbus/be.c
--- a/sys/dev/sbus/be.c Sun Jun 09 08:45:32 2013 +0000
+++ b/sys/dev/sbus/be.c Sun Jun 09 09:15:51 2013 +0000
@@ -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 @@
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 @@
device_xname(self),
(bmcr & BMCR_S100) ? "100" : "10");
}
- return 0;
+ break;
}
if ((sc->sc_mii_flags & MIIF_DOINGAUTO) == 0) {
Home |
Main Index |
Thread Index |
Old Index