Date: Sun, 27 May 2012 15:48:26 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r236154 - stable/8/sys/dev/dc Message-ID: <201205271548.q4RFmQwx058243@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Sun May 27 15:48:25 2012 New Revision: 236154 URL: http://svn.freebsd.org/changeset/base/236154 Log: MFC: r235255 (partial) Change the module order of this MAC driver to be last so its is deterministically handled after the corresponding PHY drivers when loaded as module. Otherwise, when this MAC/PHY driver combination is compiled into a single module, probing the PHY drivers may fail. This makes r151438 actually work. Reported and tested by: yongari (for fxp(4)) Given that r226154 isn't part of stable/8, the other drivers fixed as part of the original r235255 aren't affected here. Submitted by: jhb Modified: stable/8/sys/dev/dc/if_dc.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/boot/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/e1000/ (props changed) Modified: stable/8/sys/dev/dc/if_dc.c ============================================================================== --- stable/8/sys/dev/dc/if_dc.c Sun May 27 14:52:31 2012 (r236153) +++ stable/8/sys/dev/dc/if_dc.c Sun May 27 15:48:25 2012 (r236154) @@ -354,8 +354,9 @@ static driver_t dc_driver = { static devclass_t dc_devclass; -DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0); -DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0); +DRIVER_MODULE_ORDERED(dc, pci, dc_driver, dc_devclass, NULL, NULL, + SI_ORDER_ANY); +DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, NULL, NULL); #define DC_SETBIT(sc, reg, x) \ CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | (x))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205271548.q4RFmQwx058243>