Deleted Added
full compact
59c59
< __FBSDID("$FreeBSD: head/sys/dev/mii/qsphy.c 213229 2010-09-27 20:31:03Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mii/qsphy.c 213364 2010-10-02 18:53:12Z marius $");
136c136
< sc->mii_inst = mii->mii_instance;
---
> sc->mii_inst = mii->mii_instance++;
141,142d140
< mii->mii_instance++;
<
145,146c143
< sc->mii_capabilities =
< PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
---
> sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
158,159d154
< struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
< int reg;
161,173d155
< /*
< * If we're not selected, then do nothing, just isolate, if
< * changing media.
< */
< if (IFM_INST(ife->ifm_media) != sc->mii_inst) {
< if (cmd == MII_MEDIACHG) {
< reg = PHY_READ(sc, MII_BMCR);
< PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO);
< }
<
< return (0);
< }
<