From 969be1df29e3ffd70765bf9899d7ae2d89db750d Mon Sep 17 00:00:00 2001
From: Jakub Kicinski <jakub.kicinski@intel.com>
Date: Tue, 13 Nov 2012 04:03:16 +0000
Subject: [PATCH] --- yaml --- r: 340731 b: refs/heads/master c:
 e45dd5fe654b2f8e52ea9f8dacfe2b2444c87c07 h: refs/heads/master i:   340729:
 b26691aee2e8227cb08505eb6c09df2aa14f9e7a   340727:
 1149348366a3ee70483889f675740c7b97c9793c v: v3

---
 [refs]                                        |  2 +-
 .../net/ethernet/intel/ixgbevf/ixgbevf_main.c | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index d497f2a33cf8..ec4f95850639 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7c405618c41f6d00fdd24311dea9ed8305bf66a
+refs/heads/master: e45dd5fe654b2f8e52ea9f8dacfe2b2444c87c07
diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index f3d3947ae962..a8fbe6c65d7c 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -1721,8 +1721,8 @@ void ixgbevf_reset(struct ixgbevf_adapter *adapter)
 	}
 }
 
-static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
-					 int vectors)
+static int ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
+					int vectors)
 {
 	int err, vector_threshold;
 
@@ -1740,21 +1740,18 @@ static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
 	while (vectors >= vector_threshold) {
 		err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
 				      vectors);
-		if (!err) /* Success in acquiring all requested vectors. */
+		if (!err || err < 0) /* Success or a nasty failure. */
 			break;
-		else if (err < 0)
-			vectors = 0; /* Nasty failure, quit now */
 		else /* err == number of vectors we should try again with */
 			vectors = err;
 	}
 
-	if (vectors < vector_threshold) {
-		/* Can't allocate enough MSI-X interrupts?  Oh well.
-		 * This just means we'll go with either a single MSI
-		 * vector or fall back to legacy interrupts.
-		 */
-		hw_dbg(&adapter->hw,
-		       "Unable to allocate MSI-X interrupts\n");
+	if (vectors < vector_threshold)
+		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 {
@@ -1765,6 +1762,7 @@ static void ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,
 		 */
 		adapter->num_msix_vectors = vectors;
 	}
+	return err;
 }
 
 /**
@@ -1868,7 +1866,9 @@ static int ixgbevf_set_interrupt_capability(struct ixgbevf_adapter *adapter)
 	for (vector = 0; vector < v_budget; vector++)
 		adapter->msix_entries[vector].entry = vector;
 
-	ixgbevf_acquire_msix_vectors(adapter, v_budget);
+	err = ixgbevf_acquire_msix_vectors(adapter, v_budget);
+	if (err)
+		goto out;
 
 	err = netif_set_real_num_tx_queues(netdev, adapter->num_tx_queues);
 	if (err)