On Tue, 2014-02-18 at 11:11 +0100, 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. > > Signed-off-by: Alexander Gordeev <[email protected]> > Cc: Himanshu Madhani <[email protected]> > Cc: Rajesh Borundia <[email protected]> > Cc: Shahed Shaikh <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > --- > drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > index 0c077cf..e07fd94 100644 > --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c > @@ -701,13 +701,17 @@ enable_msix: > for (vector = 0; vector < num_msix; vector++) > adapter->msix_entries[vector].entry = vector; > > - err = pci_enable_msix(pdev, adapter->msix_entries, num_msix); > - if (err == 0) { > + err = pci_enable_msix_range(pdev, > + adapter->msix_entries, 1, num_msix); > + > + if (err == num_msix) { > adapter->flags |= QLCNIC_MSIX_ENABLED; > adapter->ahw->num_msix = num_msix; > dev_info(&pdev->dev, "using msi-x interrupts\n"); > return 0; > } else if (err > 0) { > + pci_disable_msix(pdev); > + > dev_info(&pdev->dev, > "Unable to allocate %d MSI-X vectors, > Available vectors %d\n", > num_msix, err);
Well this log message is nonsense - we have no idea how many vectors are available any more. You should remove this and the retry loop that is no longer needed. Ben. -- Ben Hutchings I haven't lost my mind; it's backed up on tape somewhere.
signature.asc
Description: This is a digitally signed message part
