diff options
author | Adit Ranadive <aditr@vmware.com> | 2016-10-02 22:10:21 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-12-03 15:38:24 -0500 |
commit | b1226c7db1d997fa6955cd3b54ba333bd0d8a29c (patch) | |
tree | 7028733c7d63df248746542f3271c6ca05121dac | |
parent | e37a79e5d4cac3831fac3d4afbf2461f56b4b7bd (diff) |
vmxnet3: Move PCI Id to pci_ids.h
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>
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 3 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 7dc37a090549..59e077be8829 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h | |||
@@ -119,9 +119,8 @@ enum { | |||
119 | }; | 119 | }; |
120 | 120 | ||
121 | /* | 121 | /* |
122 | * PCI vendor and device IDs. | 122 | * Maximum devices supported. |
123 | */ | 123 | */ |
124 | #define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 | ||
125 | #define MAX_ETHERNET_CARDS 10 | 124 | #define MAX_ETHERNET_CARDS 10 |
126 | #define MAX_PCI_PASSTHRU_DEVICE 6 | 125 | #define MAX_PCI_PASSTHRU_DEVICE 6 |
127 | 126 | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c58752fe16c4..98bb455302cf 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -2251,6 +2251,7 @@ | |||
2251 | #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 | 2251 | #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 |
2252 | 2252 | ||
2253 | #define PCI_VENDOR_ID_VMWARE 0x15ad | 2253 | #define PCI_VENDOR_ID_VMWARE 0x15ad |
2254 | #define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07b0 | ||
2254 | 2255 | ||
2255 | #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 | 2256 | #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 |
2256 | #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 | 2257 | #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 |