diff options
| author | bryanv <bryanv@FreeBSD.org> | 2013-10-11 06:51:56 +0000 |
|---|---|---|
| committer | bryanv <bryanv@FreeBSD.org> | 2013-10-11 06:51:56 +0000 |
| commit | f71dcbc1ce5f213a050bde6b1f041272c9a05596 (patch) | |
| tree | e076a6be325e9d979fdc8b88e0a064f4872f313a | |
| parent | 59c3f5e5a132724c9403c9554f8f7511b19dda1d (diff) | |
| download | FreeBSD-src-f71dcbc1ce5f213a050bde6b1f041272c9a05596.zip FreeBSD-src-f71dcbc1ce5f213a050bde6b1f041272c9a05596.tar.gz | |
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)
| -rw-r--r-- | sys/dev/vmware/vmxnet3/if_vmx.c | 2 | ||||
| -rw-r--r-- | sys/dev/vmware/vmxnet3/if_vmxvar.h | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index 1cab2d5..21f0947 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -1317,7 +1317,7 @@ vmxnet3_init_shared_data(struct vmxnet3_softc *sc) /* 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 diff --git a/sys/dev/vmware/vmxnet3/if_vmxvar.h b/sys/dev/vmware/vmxnet3/if_vmxvar.h index 2e7d02d..c905eb8 100644 --- a/sys/dev/vmware/vmxnet3/if_vmxvar.h +++ b/sys/dev/vmware/vmxnet3/if_vmxvar.h @@ -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. */ |
