From owner-svn-src-all@FreeBSD.ORG Fri Sep 6 20:46:42 2013 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B1C111BA; Fri, 6 Sep 2013 20:46:42 +0000 (UTC) (envelope-from mr.kodiak@gmail.com) Received: from mail-ie0-x235.google.com (mail-ie0-x235.google.com [IPv6:2607:f8b0:4001:c03::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 665AC2351; Fri, 6 Sep 2013 20:46:42 +0000 (UTC) Received: by mail-ie0-f181.google.com with SMTP id y16so2646431ieg.26 for ; Fri, 06 Sep 2013 13:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=Febk5K5DQZTY6hDjqd7nJxF1MalYr/UnBM7qYxr3xc0=; b=azrCuc/cUJn1QVcDDf7CShxA5ikf0bpcCsPOMBJzRPIf4WgY4sMgr6ZrNh61BZR4fq likOhxf89M9kjkNIxhAbiiyt3XQKfkiYU9a+01rzJequR4g6F2JqbK+DcyhQ/VFE//7k rbJHiqnELi2Z6EmPYJlk8PIH3a8r96mTCaBw3vjp/TmS+UDtKePH9pi6f94jAtin4wt0 54oEkCNWEObOco9P9vrcwB616pmDp0Fga892e/X0xzVre0VjOJ79hwlFUab4nTKN3qbn wuGECE13XITMkaXxdeFc7yK16yJ1+e4qgy7Qj3Hw83Ykh8n4JAFHZyVFcb6LflG3BN2z 8qww== X-Received: by 10.42.92.84 with SMTP id s20mr1603407icm.63.1378500401516; Fri, 06 Sep 2013 13:46:41 -0700 (PDT) MIME-Version: 1.0 Sender: mr.kodiak@gmail.com Received: by 10.64.6.136 with HTTP; Fri, 6 Sep 2013 13:46:11 -0700 (PDT) In-Reply-To: <201309062024.r86KOMqm059838@svn.freebsd.org> References: <201309062024.r86KOMqm059838@svn.freebsd.org> From: Bryan Venteicher Date: Fri, 6 Sep 2013 15:46:11 -0500 X-Google-Sender-Auth: NDiXPqCtF8RG-iAipHrm3pv3UXc Message-ID: Subject: Re: svn commit: r255323 - in head/sys: amd64/conf i386/conf To: Bryan Venteicher Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 06 Sep 2013 20:46:42 -0000 On Fri, Sep 6, 2013 at 3:24 PM, Bryan Venteicher 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" >