From 7cb0c3beb4abde406d5334376106d68997f6fb51 Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: Tue, 18 Apr 2017 13:01:56 +0200 Subject: [PATCH 2/6] vmnet: use standard definition of PCI_VENDOR_ID_VMWARE_VMXNET3 if available The PCI_DEVICE_ID_VMWARE_VMXNET3 macro is defined in mainline pci_ids.h since commit b1226c7db1d9 ("vmxnet3: Move PCI Id to pci_ids.h") in v4.10-rc1. --- vmnet-only/vm_device_version.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vmnet-only/vm_device_version.h b/vmnet-only/vm_device_version.h index cafddd0..9305ddb 100644 --- a/vmnet-only/vm_device_version.h +++ b/vmnet-only/vm_device_version.h @@ -75,7 +75,11 @@ #define PCI_DEVICE_ID_VMWARE_1394 0x0780 #define PCI_DEVICE_ID_VMWARE_BRIDGE 0x0790 #define PCI_DEVICE_ID_VMWARE_ROOTPORT 0x07A0 + +#ifndef PCI_DEVICE_ID_VMWARE_VMXNET3 #define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 +#endif + #define PCI_DEVICE_ID_VMWARE_PVSCSI 0x07C0 #define PCI_DEVICE_ID_VMWARE_82574 0x07D0 #define PCI_DEVICE_ID_VMWARE_AHCI 0x07E0 -- 2.14.3