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:
0729cc0
)
s2io: Use pci_enable_msix_range() instead of pci_enable_msix()
author
Alexander Gordeev
<
[email protected]
>
Tue, 18 Feb 2014 10:11:50 +0000
(11:11 +0100)
committer
David S. Miller
<
[email protected]
>
Tue, 18 Feb 2014 20:33:32 +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: Jon Mason <
[email protected]
>
Cc:
[email protected]
Cc:
[email protected]
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/neterion/s2io.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/neterion/s2io.c
b/drivers/net/ethernet/neterion/s2io.c
index 9eeddbd0b2c7c749de1c863e4b142c25f35c4fb9..56e3a9d42bb2f2bae40fdda6afe0d9cf1717b95b 100644
(file)
--- a/
drivers/net/ethernet/neterion/s2io.c
+++ b/
drivers/net/ethernet/neterion/s2io.c
@@
-3792,9
+3792,10
@@
static int s2io_enable_msi_x(struct s2io_nic *nic)
writeq(rx_mat, &bar0->rx_mat);
readq(&bar0->rx_mat);
- ret = pci_enable_msix(nic->pdev, nic->entries, nic->num_entries);
+ ret = pci_enable_msix_range(nic->pdev, nic->entries,
+ nic->num_entries, nic->num_entries);
/* We fail init if error or we get less vectors than min required */
- if (ret) {
+ if (ret
< 0
) {
DBG_PRINT(ERR_DBG, "Enabling MSI-X failed\n");
kfree(nic->entries);
swstats->mem_freed += nic->num_entries *