34c34
< __FBSDID("$FreeBSD: head/sys/dev/mii/ciphy.c 213893 2010-10-15 14:52:11Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/ciphy.c 215297 2010-11-14 13:26:10Z marius $");
168c168
< (void) mii_phy_auto(sc);
---
> (void)mii_phy_auto(sc);
192a193,195
> gig |= CIPHY_1000CTL_MSE;
> if ((ife->ifm_media & IFM_ETH_MASTER) != 0)
> gig |= CIPHY_1000CTL_MSC;
195,211c198
< speed|CIPHY_BMCR_AUTOEN|CIPHY_BMCR_STARTNEG);
<
< /*
< * 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, CIPHY_MII_1000CTL,
< gig|CIPHY_1000CTL_MSE|CIPHY_1000CTL_MSC);
< } else {
< PHY_WRITE(sc, CIPHY_MII_1000CTL,
< gig|CIPHY_1000CTL_MSE);
< }
---
> speed | CIPHY_BMCR_AUTOEN | CIPHY_BMCR_STARTNEG);
214c201
< PHY_WRITE(sc, MII_BMCR, BMCR_ISO|BMCR_PDOWN);
---
> PHY_WRITE(sc, MII_BMCR, BMCR_ISO | BMCR_PDOWN);
216d202
< case IFM_100_T4:
321a308,311
>
> if ((IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T) &&
> (PHY_READ(sc, CIPHY_MII_1000STS) & CIPHY_1000STS_MSR) != 0)
> mii->mii_media_active |= IFM_ETH_MASTER;