From owner-p4-projects@FreeBSD.ORG Fri Sep 6 20:33:32 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286E36DA; Fri, 6 Sep 2013 20:33:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DDF216D8 for ; Fri, 6 Sep 2013 20:33:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B201D22CF for ; Fri, 6 Sep 2013 20:33:31 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r86KXV1n008312 for ; Fri, 6 Sep 2013 20:33:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r86KXVqm008309 for perforce@freebsd.org; Fri, 6 Sep 2013 20:33:31 GMT (envelope-from jhb@freebsd.org) Date: Fri, 6 Sep 2013 20:33:31 GMT Message-Id: <201309062033.r86KXVqm008309@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 606742 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Sep 2013 20:33:32 -0000 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"