diff options
| author | Jacob Keller | 2014-09-03 10:12:56 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2014-09-18 12:48:49 +0200 |
| commit | 027bb561eff4a5c2185d3cbad6a41785eb50dded (patch) | |
| tree | c4f014ec815e9316e913247b6d715e84c66a4a08 /drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | |
| parent | ixgbe: return integer from ixgbe_acquire_msix_vectors (diff) | |
| download | kernel-qcow2-linux-027bb561eff4a5c2185d3cbad6a41785eb50dded.tar.gz kernel-qcow2-linux-027bb561eff4a5c2185d3cbad6a41785eb50dded.tar.xz kernel-qcow2-linux-027bb561eff4a5c2185d3cbad6a41785eb50dded.zip | |
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: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c index 2a388944989b..f504fafa00bd 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c @@ -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; - } + 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 |