| Message ID | a5aee403375068dd23e6f22851effe47a7e89cee.1392717503.git.agordeev@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 18 Feb 2014, Alexander Gordeev wrote: > 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. > looks good, thanks Acked-by: Govindarajulu Varadarajan <govindarajulu90@gmail.com> > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> > Cc: Christian Benvenuti <benve@cisco.com> > Cc: Sujith Sankar <ssujith@cisco.com> > Cc: Govindarajulu Varadarajan <govindarajulu90@gmail.com> > Cc: Neel Patel <neepatel@cisco.com> > Cc: netdev@vger.kernel.org > Cc: linux-pci@vger.kernel.org > --- > drivers/net/ethernet/cisco/enic/enic_main.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c > index b740bfc..dcd58f2 100644 > --- a/drivers/net/ethernet/cisco/enic/enic_main.c > +++ b/drivers/net/ethernet/cisco/enic/enic_main.c > @@ -1796,7 +1796,8 @@ static int enic_set_intr_mode(struct enic *enic) > enic->cq_count >= n + m && > enic->intr_count >= n + m + 2) { > > - if (!pci_enable_msix(enic->pdev, enic->msix_entry, n + m + 2)) { > + if (pci_enable_msix_range(enic->pdev, enic->msix_entry, > + n + m + 2, n + m + 2) > 0) { > > enic->rq_count = n; > enic->wq_count = m; > @@ -1815,7 +1816,8 @@ static int enic_set_intr_mode(struct enic *enic) > enic->wq_count >= m && > enic->cq_count >= 1 + m && > enic->intr_count >= 1 + m + 2) { > - if (!pci_enable_msix(enic->pdev, enic->msix_entry, 1 + m + 2)) { > + if (pci_enable_msix_range(enic->pdev, enic->msix_entry, > + 1 + m + 2, 1 + m + 2) > 0) { > > enic->rq_count = 1; > enic->wq_count = m; > -- > 1.7.7.6 > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index b740bfc..dcd58f2 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -1796,7 +1796,8 @@ static int enic_set_intr_mode(struct enic *enic) enic->cq_count >= n + m && enic->intr_count >= n + m + 2) { - if (!pci_enable_msix(enic->pdev, enic->msix_entry, n + m + 2)) { + if (pci_enable_msix_range(enic->pdev, enic->msix_entry, + n + m + 2, n + m + 2) > 0) { enic->rq_count = n; enic->wq_count = m; @@ -1815,7 +1816,8 @@ static int enic_set_intr_mode(struct enic *enic) enic->wq_count >= m && enic->cq_count >= 1 + m && enic->intr_count >= 1 + m + 2) { - if (!pci_enable_msix(enic->pdev, enic->msix_entry, 1 + m + 2)) { + if (pci_enable_msix_range(enic->pdev, enic->msix_entry, + 1 + m + 2, 1 + m + 2) > 0) { enic->rq_count = 1; enic->wq_count = m;
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: Christian Benvenuti <benve@cisco.com> Cc: Sujith Sankar <ssujith@cisco.com> Cc: Govindarajulu Varadarajan <govindarajulu90@gmail.com> Cc: Neel Patel <neepatel@cisco.com> Cc: netdev@vger.kernel.org Cc: linux-pci@vger.kernel.org --- drivers/net/ethernet/cisco/enic/enic_main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)