1 files changed, 11 insertions, 21 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 9df28985eba7..a6af7b7c59b1 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1817,7 +1817,6 @@ void ixgbevf_reset(struct ixgbevf_adapter *adapter)
 static int ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
                                        int vectors)
 {
-        int err = 0;
        int vector_threshold;
        /* We'll want at least 2 (vector_threshold):
@@ -1831,33 +1830,24 @@ static int ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
         * Right now, we simply care about how many we'll get; we'll
         * set them up later while requesting irq's.
         */
-        while (vectors >= vector_threshold) {
+        vectors = pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
-                err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
+                                        vector_threshold, vectors);
-                                      vectors);
-                if (!err || err < 0) /* Success or a nasty failure. */
-                        break;
-                else /* err == number of vectors we should try again with */
-                        vectors = err;
-        }
-        if (vectors < vector_threshold)
+        if (vectors < 0) {
-                err = -ENOMEM;
-        if (err) {
                dev_err(&adapter->pdev->dev,
                        "Unable to allocate MSI-X interrupts\n");
                kfree(adapter->msix_entries);
                adapter->msix_entries = NULL;
-        } else {
+                return vectors;
-                /*
-                 * Adjust for only the vectors we'll use, which is minimum
-                 * of max_msix_q_vectors + NON_Q_VECTORS, or the number of
-                 * vectors we were allocated.
-                 */
-                adapter->num_msix_vectors = vectors;
        }
-        return err;
+        /* Adjust for only the vectors we'll use, which is minimum
+         * of max_msix_q_vectors + NON_Q_VECTORS, or the number of
+         * vectors we were allocated.
+         */
+        adapter->num_msix_vectors = vectors;
+        return 0;
 }
 /**