projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7dc4c06
)
e1000e: Use pci_enable_msix_range() instead of pci_enable_msix()
author
Alexander Gordeev
<
[email protected]
>
Tue, 18 Feb 2014 10:11:41 +0000
(11:11 +0100)
committer
David S. Miller
<
[email protected]
>
Tue, 18 Feb 2014 20:33:31 +0000
(15:33 -0500)
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 <
[email protected]
>
Cc: Jeff Kirsher <
[email protected]
>
Cc: Jesse Brandeburg <
[email protected]
>
Cc: Bruce Allan <
[email protected]
>
Cc:
[email protected]
Cc:
[email protected]
Cc:
[email protected]
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/intel/e1000e/netdev.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/e1000e/netdev.c
b/drivers/net/ethernet/intel/e1000e/netdev.c
index 6d91933c4cdd3873990ba36100dd5ae7f21a7782..e6f8961d49ebe4dbe2e998d8e90bbee61e87f04c 100644
(file)
--- 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)
msix_entry),
GFP_KERNEL);
if (adapter->msix_entries) {
+ struct e1000_adapter *a = adapter;
+
for (i = 0; i < adapter->num_vectors; i++)
adapter->msix_entries[i].entry = i;
- err = pci_enable_msix(adapter->pdev,
- adapter->msix_entries,
- adapter->num_vectors);
- if (err == 0)
+ err = pci_enable_msix_range(a->pdev,
+ a->msix_entries,
+ a->num_vectors,
+ a->num_vectors);
+ if (err > 0)
return;
}
/* MSI-X failed, so fall through and try MSI */