diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2008-05-13 01:40:40 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2008-05-13 01:40:40 +0000 |
| commit | b3322fa5678192b118237590187191aad4f7e4ee (patch) | |
| tree | a161111bd9e5f5e8825d89eab31b03fe82ae23f1 /sys | |
| parent | 7e5a9b60f2fba8de719d7f511bdd7dbc42deec00 (diff) | |
Since Ethernet links can only be full duplex or half duplex the link
state reporting code in the MII layer / em(4) and vge(4) will never
fall back to the point of only reporting the link as being UP without
the duplex setting being reported, so simplify the code a bit here.
ok dlg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/mii/mii_physubr.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_em.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_vge.c | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index 8caebf80e1c..dc2fce81681 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mii_physubr.c,v 1.33 2007/09/17 17:34:22 brad Exp $ */ +/* $OpenBSD: mii_physubr.c,v 1.34 2008/05/13 01:40:39 brad Exp $ */ /* $NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $ */ /*- @@ -369,10 +369,8 @@ mii_phy_statusmsg(struct mii_softc *sc) if (mii->mii_media_status & IFM_ACTIVE) { if (mii->mii_media_active & IFM_FDX) link_state = LINK_STATE_FULL_DUPLEX; - else if (mii->mii_media_active & IFM_HDX) - link_state = LINK_STATE_HALF_DUPLEX; else - link_state = LINK_STATE_UP; + link_state = LINK_STATE_HALF_DUPLEX; } else link_state = LINK_STATE_DOWN; } else diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c index 788f9072566..90a5d5f49c4 100644 --- a/sys/dev/pci/if_em.c +++ b/sys/dev/pci/if_em.c @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ -/* $OpenBSD: if_em.c,v 1.181 2008/04/09 12:50:11 dlg Exp $ */ +/* $OpenBSD: if_em.c,v 1.182 2008/05/13 01:40:39 brad Exp $ */ /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */ #include <dev/pci/if_em.h> @@ -1407,10 +1407,8 @@ em_update_link_status(struct em_softc *sc) ifp->if_baudrate = sc->link_speed * 1000000; if (sc->link_duplex == FULL_DUPLEX) ifp->if_link_state = LINK_STATE_FULL_DUPLEX; - else if (sc->link_duplex == HALF_DUPLEX) - ifp->if_link_state = LINK_STATE_HALF_DUPLEX; else - ifp->if_link_state = LINK_STATE_UP; + ifp->if_link_state = LINK_STATE_HALF_DUPLEX; if_link_state_change(ifp); } } else { diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c index a978623b19b..501ed391e6e 100644 --- a/sys/dev/pci/if_vge.c +++ b/sys/dev/pci/if_vge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vge.c,v 1.35 2007/12/11 02:36:02 brad Exp $ */ +/* $OpenBSD: if_vge.c,v 1.36 2008/05/13 01:40:39 brad Exp $ */ /* $FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $ */ /* * Copyright (c) 2004 @@ -1193,10 +1193,8 @@ vge_tick(void *xsc) sc->vge_link = 1; if (mii->mii_media_status & IFM_FDX) ifp->if_link_state = LINK_STATE_FULL_DUPLEX; - else if (mii->mii_media_status & IFM_HDX) - ifp->if_link_state = LINK_STATE_HALF_DUPLEX; else - ifp->if_link_state = LINK_STATE_UP; + ifp->if_link_state = LINK_STATE_HALF_DUPLEX; if_link_state_change(ifp); if (!IFQ_IS_EMPTY(&ifp->if_snd)) vge_start(ifp); |