diff options
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index a3dc9657f572..2e4523c7ab9e 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
| @@ -7551,11 +7551,11 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev, | |||
| 7551 | } | 7551 | } |
| 7552 | 7552 | ||
| 7553 | /* Find the pci device of the offending VF */ | 7553 | /* Find the pci device of the offending VF */ |
| 7554 | vfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL); | 7554 | vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL); |
| 7555 | while (vfdev) { | 7555 | while (vfdev) { |
| 7556 | if (vfdev->devfn == (req_id & 0xFF)) | 7556 | if (vfdev->devfn == (req_id & 0xFF)) |
| 7557 | break; | 7557 | break; |
| 7558 | vfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, | 7558 | vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, |
| 7559 | device_id, vfdev); | 7559 | device_id, vfdev); |
| 7560 | } | 7560 | } |
| 7561 | /* | 7561 | /* |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index d2854434ad12..089468224e7e 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | |||
| @@ -65,13 +65,13 @@ static int ixgbe_find_enabled_vfs(struct ixgbe_adapter *adapter) | |||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | vf_devfn = pdev->devfn + 0x80; | 67 | vf_devfn = pdev->devfn + 0x80; |
| 68 | pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL); | 68 | pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL); |
| 69 | while (pvfdev) { | 69 | while (pvfdev) { |
| 70 | if (pvfdev->devfn == vf_devfn && | 70 | if (pvfdev->devfn == vf_devfn && |
| 71 | (pvfdev->bus->number >= pdev->bus->number)) | 71 | (pvfdev->bus->number >= pdev->bus->number)) |
| 72 | vfs_found++; | 72 | vfs_found++; |
| 73 | vf_devfn += 2; | 73 | vf_devfn += 2; |
| 74 | pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, | 74 | pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, |
| 75 | device_id, pvfdev); | 75 | device_id, pvfdev); |
| 76 | } | 76 | } |
| 77 | 77 | ||
| @@ -518,11 +518,11 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask) | |||
| 518 | break; | 518 | break; |
| 519 | } | 519 | } |
| 520 | 520 | ||
| 521 | pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL); | 521 | pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL); |
| 522 | while (pvfdev) { | 522 | while (pvfdev) { |
| 523 | if (pvfdev->devfn == thisvf_devfn) | 523 | if (pvfdev->devfn == thisvf_devfn) |
| 524 | break; | 524 | break; |
| 525 | pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, | 525 | pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, |
| 526 | device_id, pvfdev); | 526 | device_id, pvfdev); |
| 527 | } | 527 | } |
| 528 | if (pvfdev) | 528 | if (pvfdev) |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h index 7416d22ec227..a5ceea4d329a 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | |||
| @@ -32,9 +32,6 @@ | |||
| 32 | #include <linux/mdio.h> | 32 | #include <linux/mdio.h> |
| 33 | #include <linux/netdevice.h> | 33 | #include <linux/netdevice.h> |
| 34 | 34 | ||
| 35 | /* Vendor ID */ | ||
| 36 | #define IXGBE_INTEL_VENDOR_ID 0x8086 | ||
| 37 | |||
| 38 | /* Device IDs */ | 35 | /* Device IDs */ |
| 39 | #define IXGBE_DEV_ID_82598 0x10B6 | 36 | #define IXGBE_DEV_ID_82598 0x10B6 |
| 40 | #define IXGBE_DEV_ID_82598_BX 0x1508 | 37 | #define IXGBE_DEV_ID_82598_BX 0x1508 |
