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

Commit 027bb561 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

ixgbe: move msix_entries allocation into ixgbe_acquire_msix_vectors 



We already have to kfree this value if we fail, and this is only part of
MSI-X mode, so we should simply allocate the value where we need it.
This is cleaner, and makes it a lot more obvious why we are freeing it
inside of ixgbe_acquire_msix_vectors.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d7de3c6e

drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c

+13 −11
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static void ixgbe_set_num_queues(struct ixgbe_adapter *adapter) 
static int ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,

				      int vectors)

{

	int vector_threshold;

	int i, vector_threshold;



	/* We'll want at least 2 (vector_threshold):

	 * 1) TxQ[0] + RxQ[0] handler
@@ -713,6 +713,15 @@ static int ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter, 
	 * Right now, we simply care about how many we'll get; we'll

	 * set them up later while requesting irq's.

	 */

	adapter->msix_entries = kcalloc(vectors,

					sizeof(struct msix_entry),

					GFP_KERNEL);

	if (!adapter->msix_entries)

		return -ENOMEM;



	for (i = 0; i < vectors; i++)

		adapter->msix_entries[i].entry = i;



	vectors = pci_enable_msix_range(adapter->pdev, adapter->msix_entries,

					vector_threshold, vectors);
@@ -1061,7 +1070,7 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter) 
static void ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)

{

	struct ixgbe_hw *hw = &adapter->hw;

	int vector, v_budget, err;

	int v_budget, err;



	/*

	 * It's easy to be greedy for MSI-X vectors, but it really
@@ -1085,15 +1094,8 @@ static void ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) 


	/* A failure in MSI-X entry allocation isn't fatal, but it does

	 * mean we disable MSI-X capabilities of the adapter. */

	adapter->msix_entries = kcalloc(v_budget,

					sizeof(struct msix_entry), GFP_KERNEL);

	if (adapter->msix_entries) {

		for (vector = 0; vector < v_budget; vector++)

			adapter->msix_entries[vector].entry = vector;



	if (!ixgbe_acquire_msix_vectors(adapter, v_budget))

		return;

	}



	/* At this point, we do not have MSI-X capabilities. We need to

	 * reconfigure or disable various features which require MSI-X