Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a1fa45 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller
Browse files

qlcnic: Cleanup qlcnic_enable_msix() return values 



Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Cc: Himanshu Madhani <himanshu.madhani@qlogic.com>
Cc: Rajesh Borundia <rajesh.borundia@qlogic.com>
Cc: Shahed Shaikh <shahed.shaikh@qlogic.com>
Cc: linux-driver@qlogic.com
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a6768d3

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+5 −5
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ int qlcnic_setup_tss_rss_intr(struct qlcnic_adapter *adapter) 
int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)

{

	struct pci_dev *pdev = adapter->pdev;

	int err = -1, vector;

	int err, vector;



	if (!adapter->msix_entries) {

		adapter->msix_entries = kcalloc(num_msix,
@@ -706,7 +706,7 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix) 
			adapter->flags |= QLCNIC_MSIX_ENABLED;

			adapter->ahw->num_msix = num_msix;

			dev_info(&pdev->dev, "using msi-x interrupts\n");

			return err;

			return 0;

		} else if (err > 0) {

			dev_info(&pdev->dev,

				 "Unable to allocate %d MSI-X vectors, Available vectors %d\n",
@@ -715,12 +715,12 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix) 
			if (qlcnic_82xx_check(adapter)) {

				num_msix = rounddown_pow_of_two(err);

				if (err < QLCNIC_82XX_MINIMUM_VECTOR)

					return -EIO;

					return -ENOSPC;

			} else {

				num_msix = rounddown_pow_of_two(err - 1);

				num_msix += 1;

				if (err < QLCNIC_83XX_MINIMUM_VECTOR)

					return -EIO;

					return -ENOSPC;

			}



			if (qlcnic_82xx_check(adapter) &&
@@ -747,7 +747,7 @@ int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix) 
		}

	}



	return err;

	return -EIO;

}



static int qlcnic_82xx_calculate_msix_vector(struct qlcnic_adapter *adapter)