34c34
< __FBSDID("$FreeBSD: head/sys/dev/dc/pnphy.c 217417 2011-01-14 20:26:59Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/dc/pnphy.c 221407 2011-05-03 19:51:29Z marius $");
92a93
> static void pnphy_reset(struct mii_softc *);
93a95,100
> static const struct mii_phy_funcs pnphy_funcs = {
> pnphy_service,
> pnphy_status,
> pnphy_reset
> };
>
118,119d124
< struct mii_attach_args *ma;
< struct mii_data *mii;
122,125d126
< 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);
127,131c128,129
< sc->mii_flags = miibus_get_flags(dev);
< sc->mii_inst = mii->mii_instance++;
< sc->mii_phy = ma->mii_phyno;
< sc->mii_service = pnphy_service;
< sc->mii_pdata = mii;
---
> mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE,
> &pnphy_funcs, 0);
133,137d130
< /*
< * Apparently, we can neither isolate nor do loopback.
< */
< sc->mii_flags |= MIIF_NOISOLATE | MIIF_NOLOOP;
<
140c133
< sc->mii_capabilities &= ma->mii_capmask;
---
> sc->mii_capabilities &= sc->mii_capmask;
197c190
< pnphy_status(sc);
---
> PHY_STATUS(sc);
228a222,227
>
> static void
> pnphy_reset(struct mii_softc *sc __unused)
> {
>
> }