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:
a5444b1
)
tg3: Use pci_enable_msix_range() instead of pci_enable_msix()
author
Alexander Gordeev
<
[email protected]
>
Tue, 18 Feb 2014 10:07:55 +0000
(11:07 +0100)
committer
David S. Miller
<
[email protected]
>
Tue, 18 Feb 2014 20:33:29 +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: Nithin Nayak Sujir <
[email protected]
>
Cc: Michael Chan <
[email protected]
>
Cc:
[email protected]
Cc:
[email protected]
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/broadcom/tg3.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/tg3.c
b/drivers/net/ethernet/broadcom/tg3.c
index 3167ed6593b0410bc0382294a015e3ac06e1ffed..6e5e7c0ffbd7ccbc5e52a5f4660d83d3aad7e5d1 100644
(file)
--- a/
drivers/net/ethernet/broadcom/tg3.c
+++ b/
drivers/net/ethernet/broadcom/tg3.c
@@
-11362,12
+11362,10
@@
static bool tg3_enable_msix(struct tg3 *tp)
msix_ent[i].vector = 0;
}
- rc = pci_enable_msix
(tp->pdev, msix_ent
, tp->irq_cnt);
+ rc = pci_enable_msix
_range(tp->pdev, msix_ent, 1
, tp->irq_cnt);
if (rc < 0) {
return false;
- } else if (rc != 0) {
- if (pci_enable_msix(tp->pdev, msix_ent, rc))
- return false;
+ } else if (rc < tp->irq_cnt) {
netdev_notice(tp->dev, "Requested %d MSI-X vectors, received %d\n",
tp->irq_cnt, rc);
tp->irq_cnt = rc;