From owner-svn-src-stable-8@FreeBSD.ORG Sun May 27 15:48:26 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7215F1065675; Sun, 27 May 2012 15:48:26 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5C50C8FC1B; Sun, 27 May 2012 15:48:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4RFmQLG058245; Sun, 27 May 2012 15:48:26 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4RFmQwx058243; Sun, 27 May 2012 15:48:26 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201205271548.q4RFmQwx058243@svn.freebsd.org> From: Marius Strobl Date: Sun, 27 May 2012 15:48:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236154 - stable/8/sys/dev/dc X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 May 2012 15:48:26 -0000 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))