From owner-svn-src-all@FreeBSD.ORG Wed May 27 19:09:19 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74ABC9D5; Wed, 27 May 2015 19:09:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E685666; Wed, 27 May 2015 19:09:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net [173.54.116.245]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 530B0B939; Wed, 27 May 2015 15:09:17 -0400 (EDT) From: John Baldwin To: Eric Joyner Cc: 'Jack F Vogel' , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r283620 - in stable/10/sys: amd64/conf conf dev/ixgbe modules modules/ix modules/ixv Date: Wed, 27 May 2015 15:09:13 -0400 Message-ID: <16669147.Y9s9XdOlga@ralph.baldwin.cx> User-Agent: KMail/4.14.3 (FreeBSD/10.1-STABLE; KDE/4.14.3; amd64; ; ) In-Reply-To: <201505271744.t4RHiC04024525@svn.freebsd.org> References: <201505271744.t4RHiC04024525@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Wed, 27 May 2015 15:09:17 -0400 (EDT) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 May 2015 19:09:19 -0000 On Wednesday, May 27, 2015 05:44:12 PM Eric Joyner wrote: > Author: erj > Date: Wed May 27 17:44:11 2015 > New Revision: 283620 > URL: https://svnweb.freebsd.org/changeset/base/283620 > > Log: > MFC ixgbe commits for 10.2: > > - r280182 - Split the driver into independent pf/vf loadables > - r280197 - Resolve build issues > - r280204 - Fix multiple same-name devclasses > - r280228 - Fix i386 LINT build issues / remove unused variable > - r280252 - Fix building ixgbe with gcc > - r280962 - Make changes to busdma code similar to r257541 > - r281772 & r281773 - Remove unused variable > - partial r282280 - stats counter update (ix-only) > - r282289 - Add X550 support > - r282290 - Add X550 makefile updates > - r282293 - Add ixgbe_x550.c to conf/files > - r282299 - Fix gcc compile (extraneous extern declaration) > > Finally, add ix_txrx.c to conf/files because it's required for compile in stable/10. > > Approved by: jfv (mentor) It would be better to not break existing kernel configs for 10. You could hack the lines in sys/conf/files to allow either 'device ix' or 'device ixgbe' to work by using 'optional ixgbe ix', etc. You wouldn't need to document it in NOTES and you could leave your existing changes in GENERIC, but this would avoid surprises for folks who were using custom kernel configs. Similarly, you probably want to allow 'kldload ixgbe' or 'ixgbe_load="YES"' in loader.conf to still work. You can try just installing an 'ixgbe.ko' symlink via the module's Makefile, though I'm not sure that will work correctly for the loader.conf case. If it doesn't, then the other route is to create a stub ixgbe.c file that MODULE_DEPEND()'s on the ix and ixv driver modules so that it autoloads if_ix.ko and if_ixv.ko as dependencies when it is loaded. -- John Baldwin