diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-12-30 23:04:40 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2006-12-30 23:04:40 +0000 |
| commit | 93446b31c3db5d2813b10cf04b55932e1495c511 (patch) | |
| tree | 009fdb82e45f90145dc366a844bec385df5b0dca /sys/dev/mii/ipgphy.c | |
| parent | cb871034265eaf501f859284e8a5c4cf65e55cb0 (diff) | |
Set MASTER based on IFM_ETH_MASTER instead of LINK0.
ok brad@
Diffstat (limited to 'sys/dev/mii/ipgphy.c')
| -rw-r--r-- | sys/dev/mii/ipgphy.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/sys/dev/mii/ipgphy.c b/sys/dev/mii/ipgphy.c index 519ef03dc11..d2586750e21 100644 --- a/sys/dev/mii/ipgphy.c +++ b/sys/dev/mii/ipgphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipgphy.c,v 1.5 2006/12/30 20:59:44 kettenis Exp $ */ +/* $OpenBSD: ipgphy.c,v 1.6 2006/12/30 23:04:39 kettenis Exp $ */ /*- * Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org> @@ -217,23 +217,10 @@ ipgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) PHY_WRITE(sc, IPGPHY_MII_1000CR, gig); PHY_WRITE(sc, IPGPHY_MII_BMCR, speed); - /* - * When setting the link manually, one side must - * be the master and the other the slave. However - * ifmedia doesn't give us a good way to specify - * this, so we fake it by using one of the LINK - * flags. If LINK0 is set, we program the PHY to - * be a master, otherwise it's a slave. - */ - if ((mii->mii_ifp->if_flags & IFF_LINK0)) - PHY_WRITE(sc, IPGPHY_MII_1000CR, gig | - IPGPHY_1000CR_MASTER | - IPGPHY_1000CR_MMASTER | - IPGPHY_1000CR_MANUAL); - else - PHY_WRITE(sc, IPGPHY_MII_1000CR, gig | - IPGPHY_1000CR_MASTER | - IPGPHY_1000CR_MANUAL); + if (mii->mii_media.ifm_media & IFM_ETH_MASTER) + gig |= IPGPHY_1000CR_MASTER | IPGPHY_1000CR_MANUAL; + + PHY_WRITE(sc, IPGPHY_MII_1000CR, gig); done: break; |