Date: Fri, 6 Sep 2013 20:33:31 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 606742 for review Message-ID: <201309062033.r86KXVqm008309@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@606742?ac=10 Change 606742 by jhb@jhb_jhbbsd on 2013/09/06 20:33:18 IFC @606686 Affected files ... .. //depot/projects/smpng/sys/amd64/conf/NOTES#72 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#164 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/NOTES#72 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: head/sys/amd64/conf/NOTES 254624 2013-08-21 22:43:29Z obrien $ +# $FreeBSD: head/sys/amd64/conf/NOTES 255323 2013-09-06 20:24:21Z bryanv $ # # @@ -309,6 +309,7 @@ # 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 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 ==== //depot/projects/smpng/sys/i386/conf/NOTES#164 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: head/sys/i386/conf/NOTES 254624 2013-08-21 22:43:29Z obrien $ +# $FreeBSD: head/sys/i386/conf/NOTES 255323 2013-09-06 20:24:21Z bryanv $ # # @@ -580,6 +580,7 @@ # 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.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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309062033.r86KXVqm008309>