vmxnet3: Move PCI Id to pci_ids.h

Orabug: 25639933

The VMXNet3 PCI Id will be shared with our paravirtual RDMA driver.
Moved it to the shared location in pci_ids.h.

Suggested-by: Leon Romanovsky <leon@kernel.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Adit Ranadive <aditr@vmware.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
(cherry picked from commit b1226c7db1d997fa6955cd3b54ba333bd0d8a29c)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 7dc37a090549f7ff949e7e5c4a8275128689b980..59e077be88290e5ffbd470850f98d1bb762c3f04 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -119,9 +119,8 @@ enum {
 };
 
 /*
- * PCI vendor and device IDs.
+ * Maximum devices supported.
  */
-#define PCI_DEVICE_ID_VMWARE_VMXNET3    0x07B0
 #define MAX_ETHERNET_CARDS             10
 #define MAX_PCI_PASSTHRU_DEVICE                6
 

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2f7b9a40f627ead2e04d4105ad1eaeab76fdf5bf..1374d8daf3c3553c3909c8660256c1ba6c2e1c05 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2249,6 +2249,7 @@
 #define PCI_DEVICE_ID_RASTEL_2PORT     0x2000
 
 #define PCI_VENDOR_ID_VMWARE           0x15ad
+#define PCI_DEVICE_ID_VMWARE_VMXNET3   0x07b0
 
 #define PCI_VENDOR_ID_ZOLTRIX          0x15b0
 #define PCI_DEVICE_ID_ZOLTRIX_2BD0     0x2bd0