Re: [net-next 10/14] ixgbevf: make sure probe fails on MSI-X enable error

On Fri, 26 Oct 2012 12:43:12 +0000
"Kicinski, Jakub" [off-list ref] wrote:

quoted

From: Jakub Kicinski <redacted>

This driver cannot work without MSI-X interrupts so there is no
mechanism to fall back to.

Signed-off-by: Jakub Kicinski <redacted>
Acked-by: Greg Rose <redacted>
Tested-by: Sibai Li <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 24
+++++++++++------------ 1 file changed, 11 insertions(+), 13
deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index b5979ba..7ceccff 100644

--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

[...]

quoted

@@ -1858,7 +1856,7 @@ 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);

 	err = netif_set_real_num_tx_queues(netdev,
adapter->num_tx_queues); if (err)

This is clearly wrong. My change was overtaken by:

commit 91e2b89b04d3f568dc4ec99f242a4a742061e399
Author: Greg Rose [off-list ref]
Date:   Wed Oct 3 00:57:23 2012 +0000

    ixgbevf: Set the netdev number of Tx queues

Please drop this patch, I'll resend a fixed version to Greg.

Yikes!  Yeah, that patch got munged somehow.  Thanks!

- Greg