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.
*/
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
