From owner-svn-src-all@FreeBSD.ORG Fri Oct 11 06:51:57 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 02F91B21; Fri, 11 Oct 2013 06:51:57 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 E38352C00; Fri, 11 Oct 2013 06:51:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9B6pu9K070865; Fri, 11 Oct 2013 06:51:56 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9B6puCR070863; Fri, 11 Oct 2013 06:51:56 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201310110651.r9B6puCR070863@svn.freebsd.org> From: Bryan Venteicher Date: Fri, 11 Oct 2013 06:51:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org Subject: svn commit: r256309 - stable/10/sys/dev/vmware/vmxnet3 X-SVN-Group: defaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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, 11 Oct 2013 06:51:57 -0000 Author: bryanv Date: Fri Oct 11 06:51:56 2013 New Revision: 256309 URL: http://svnweb.freebsd.org/changeset/base/256309 Log: MFC r256308: Do not provide a hint of the guest's OS version The calculation can overflow if __FreeBSD_version is big enough, and it does not appear to be required. Approved by: re (gjb) Modified: stable/10/sys/dev/vmware/vmxnet3/if_vmx.c stable/10/sys/dev/vmware/vmxnet3/if_vmxvar.h Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/vmware/vmxnet3/if_vmx.c ============================================================================== --- stable/10/sys/dev/vmware/vmxnet3/if_vmx.c Fri Oct 11 06:48:40 2013 (r256308) +++ stable/10/sys/dev/vmware/vmxnet3/if_vmx.c Fri Oct 11 06:51:56 2013 (r256309) @@ -1317,7 +1317,7 @@ vmxnet3_init_shared_data(struct vmxnet3_ /* DriverInfo */ ds->version = VMXNET3_DRIVER_VERSION; - ds->guest = VMXNET3_GOS_FREEBSD | VMXNET3_GUEST_OS_VERSION | + ds->guest = VMXNET3_GOS_FREEBSD | #ifdef __LP64__ VMXNET3_GOS_64BIT; #else Modified: stable/10/sys/dev/vmware/vmxnet3/if_vmxvar.h ============================================================================== --- stable/10/sys/dev/vmware/vmxnet3/if_vmxvar.h Fri Oct 11 06:48:40 2013 (r256308) +++ stable/10/sys/dev/vmware/vmxnet3/if_vmxvar.h Fri Oct 11 06:51:56 2013 (r256309) @@ -248,17 +248,6 @@ struct vmxnet3_softc { #define VMXNET3_DRIVER_VERSION 0x00010000 /* - * Convert the FreeBSD version in to something the hypervisor - * understands. This is apparently what VMware's driver reports - * so mimic it even though it probably is not required. - */ -#define VMXNET3_GUEST_OS_VERSION \ - (((__FreeBSD_version / 100000) << 14) | \ - (((__FreeBSD_version / 1000) % 100) << 6 ) | \ - (((__FreeBSD_version / 100) % 10) << 30) | \ - ((__FreeBSD_version % 100) << 22)) - -/* * Max descriptors per Tx packet. We must limit the size of the * any TSO packets based on the number of segments. */