29c29
< __FBSDID("$FreeBSD: head/sys/dev/mii/ruephy.c 213893 2010-10-15 14:52:11Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/ruephy.c 221407 2011-05-03 19:51:29Z marius $");
90a91,96
> static const struct mii_phy_funcs ruephy_funcs = {
> ruephy_service,
> ruephy_status,
> ruephy_reset
> };
>
104,106d109
< struct mii_softc *sc;
< struct mii_attach_args *ma;
< struct mii_data *mii;
108,132c111,112
< sc = device_get_softc(dev);
< ma = device_get_ivars(dev);
< sc->mii_dev = device_get_parent(dev);
< mii = ma->mii_data;
< LIST_INSERT_HEAD(&mii->mii_phys, sc, mii_list);
<
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = ruephy_service;
< sc->mii_pdata = mii;
<
< /*
< * Apparently, we can neither isolate nor do loopback on this PHY.
< */
< sc->mii_flags |= MIIF_NOISOLATE | MIIF_NOLOOP;
<
< ruephy_reset(sc);
<
< sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
< device_printf(dev, " ");
< mii_phy_add_media(sc);
< printf("\n");
<
< MIIBUS_MEDIAINIT(sc->mii_dev);
---
> mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE,
> &ruephy_funcs, 1);
184c164
< ruephy_reset(sc);
---
> PHY_RESET(sc);
191c171
< ruephy_status(sc);
---
> PHY_STATUS(sc);
247c227,228
< mii->mii_media_active |= IFM_FDX;
---
> mii->mii_media_active |=
> IFM_FDX | mii_phy_flowstatus(phy);