svn commit: r203362 - stable/7/sys/dev/nve
John Baldwin
jhb at FreeBSD.org
Mon Feb 1 22:16:44 UTC 2010
Author: jhb
Date: Mon Feb 1 22:16:44 2010
New Revision: 203362
URL: http://svn.freebsd.org/changeset/base/203362
Log:
MFC 203070:
Initialize the ifnet before calling mii_phy_probe() as some phy drivers
(e.g. e1000phy(4)) expect if_dname to be valid when they are probed.
Approved by: re (kensmith)
Modified:
stable/7/sys/dev/nve/if_nve.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/nve/if_nve.c
==============================================================================
--- stable/7/sys/dev/nve/if_nve.c Mon Feb 1 22:01:48 2010 (r203361)
+++ stable/7/sys/dev/nve/if_nve.c Mon Feb 1 22:16:44 2010 (r203362)
@@ -526,14 +526,6 @@ nve_attach(device_t dev)
goto fail;
}
- /* Probe device for MII interface to PHY */
- DEBUGOUT(NVE_DEBUG_INIT, "nve: do mii_phy_probe\n");
- if (mii_phy_probe(dev, &sc->miibus, nve_ifmedia_upd, nve_ifmedia_sts)) {
- device_printf(dev, "MII without any phy!\n");
- error = ENXIO;
- goto fail;
- }
-
/* Setup interface parameters */
ifp->if_softc = sc;
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
@@ -552,6 +544,14 @@ nve_attach(device_t dev)
ifp->if_capabilities |= IFCAP_VLAN_MTU;
ifp->if_capenable |= IFCAP_VLAN_MTU;
+ /* Probe device for MII interface to PHY */
+ DEBUGOUT(NVE_DEBUG_INIT, "nve: do mii_phy_probe\n");
+ if (mii_phy_probe(dev, &sc->miibus, nve_ifmedia_upd, nve_ifmedia_sts)) {
+ device_printf(dev, "MII without any phy!\n");
+ error = ENXIO;
+ goto fail;
+ }
+
/* Attach to OS's managers. */
ether_ifattach(ifp, eaddr);
More information about the svn-src-stable-7
mailing list