aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/netdev.c
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-02-18 05:11:41 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-18 15:33:31 -0500
commit0cc7c959fa8920e0b5922d04663e6bbb1e041252 (patch)
tree41ae60a35905fa02031e730b038841fe9e4fbbe5 /drivers/net/ethernet/intel/e1000e/netdev.c
parent7dc4c064943314e1228c8aa0ff7644c7c87b0c8d (diff)
e1000e: Use pci_enable_msix_range() instead of pci_enable_msix()
As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() and pci_enable_msix_range() interfaces. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Bruce Allan <bruce.w.allan@intel.com> Cc: e1000-devel@lists.sourceforge.net Cc: netdev@vger.kernel.org Cc: linux-pci@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 6d91933c4cdd..e6f8961d49eb 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2038,13 +2038,16 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
2038 msix_entry), 2038 msix_entry),
2039 GFP_KERNEL); 2039 GFP_KERNEL);
2040 if (adapter->msix_entries) { 2040 if (adapter->msix_entries) {
2041 struct e1000_adapter *a = adapter;
2042
2041 for (i = 0; i < adapter->num_vectors; i++) 2043 for (i = 0; i < adapter->num_vectors; i++)
2042 adapter->msix_entries[i].entry = i; 2044 adapter->msix_entries[i].entry = i;
2043 2045
2044 err = pci_enable_msix(adapter->pdev, 2046 err = pci_enable_msix_range(a->pdev,
2045 adapter->msix_entries, 2047 a->msix_entries,
2046 adapter->num_vectors); 2048 a->num_vectors,
2047 if (err == 0) 2049 a->num_vectors);
2050 if (err > 0)
2048 return; 2051 return;
2049 } 2052 }
2050 /* MSI-X failed, so fall through and try MSI */ 2053 /* MSI-X failed, so fall through and try MSI */