svn commit: r283620 - in stable/10/sys: amd64/conf conf dev/ixgbe modules modules/ix modules/ixv

[John Baldwin]

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