svn commit: r255323 - in head/sys: amd64/conf i386/conf

[Bryan Venteicher]

On Fri, Sep 6, 2013 at 3:24 PM, Bryan Venteicher <bryanv at freebsd.org> wrote:

> Author: bryanv
> Date: Fri Sep  6 20:24:21 2013
> New Revision: 255323
> URL: http://svnweb.freebsd.org/changeset/base/255323
>
> Log:
>   Add vmx device to the i386 and amd64 NOTES files
>
>
FWIW - I'm on the fence about adding vmx to GENERIC for 10.0. IIRC,
VMware's vmxnet3 driver returns BUS_PROBE_VENDOR so the two drivers should
coexist. This is assuming VMware updates the driver for 10 ... which I'm
guessing isn't likely and was a large reason I added this driver in the
first place.

LMK if anybody has strong thoughts either way.


Modified:
>   head/sys/amd64/conf/NOTES
>   head/sys/i386/conf/NOTES
>
> Modified: head/sys/amd64/conf/NOTES
>
> ==============================================================================
> --- head/sys/amd64/conf/NOTES   Fri Sep  6 20:23:15 2013        (r255322)
> +++ head/sys/amd64/conf/NOTES   Fri Sep  6 20:24:21 2013        (r255323)
> @@ -309,6 +309,7 @@ options     DRM_DEBUG       # Include debug print
>  # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
>  # nve: nVidia nForce MCP on-board Ethernet Networking
>  # sfxge: Solarflare SFC9000 family 10Gb Ethernet adapters
> +# vmx: VMware VMXNET3 Ethernet (BSD open source)
>  # wpi: Intel 3945ABG Wireless LAN controller
>  #      Requires the wpi firmware module
>
> @@ -325,6 +326,7 @@ device      mthca           # Mellanox HCA InfiniBan
>  device         nfe             # nVidia nForce MCP on-board Ethernet
>  device         nve             # nVidia nForce MCP on-board Ethernet
> Networking
>  device         sfxge           # Solarflare SFC9000 10Gb Ethernet
> +device         vmx             # VMware VMXNET3 Ethernet
>  device         wpi             # Intel 3945ABG wireless NICs.
>
>  # IEEE 802.11 adapter firmware modules
>
> Modified: head/sys/i386/conf/NOTES
>
> ==============================================================================
> --- head/sys/i386/conf/NOTES    Fri Sep  6 20:23:15 2013        (r255322)
> +++ head/sys/i386/conf/NOTES    Fri Sep  6 20:24:21 2013        (r255323)
> @@ -580,6 +580,7 @@ hint.mse.0.irq="5"
>  # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
>  # nve: nVidia nForce MCP on-board Ethernet Networking
>  # sbni: Granch SBNI12-xx ISA and PCI adapters
> +# vmx: VMware VMXNET3 Ethernet (BSD open source)
>  # wl:   Lucent Wavelan (ISA card only).
>  # wpi: Intel 3945ABG Wireless LAN controller
>  #      Requires the wpi firmware module
> @@ -629,6 +630,7 @@ hint.sbni.0.at="isa"
>  hint.sbni.0.port="0x210"
>  hint.sbni.0.irq="0xefdead"
>  hint.sbni.0.flags="0"
> +device         vmx             # VMware VMXNET3 Ethernet
>  device         wl
>  hint.wl.0.at="isa"
>  hint.wl.0.port="0x300"
>