From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Rose Subject: Re: [net-next 10/14] ixgbevf: make sure probe fails on MSI-X enable error Date: Fri, 26 Oct 2012 09:32:21 -0700 Message-ID: <20121026093221.000038cb@unknown> References: <1351252702-16532-1-git-send-email-jeffrey.t.kirsher@intel.com> <1351252702-16532-11-git-send-email-jeffrey.t.kirsher@intel.com> <4F2EF616F787D840B1215485A0B91D1E5EF3AD@IRSMSX103.ger.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Cc: "Kirsher, Jeffrey T" , "davem@davemloft.net" , "netdev@vger.kernel.org" , "gospo@redhat.com" , "sassmann@redhat.com" To: "Kicinski, Jakub" Return-path: Received: from mga03.intel.com ([143.182.124.21]:46640 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965257Ab2JZQca (ORCPT ); Fri, 26 Oct 2012 12:32:30 -0400 In-Reply-To: <4F2EF616F787D840B1215485A0B91D1E5EF3AD@IRSMSX103.ger.corp.intel.com> Sender: netdev-owner@vger.kernel.org List-ID: On Fri, 26 Oct 2012 12:43:12 +0000 "Kicinski, Jakub" wrote: > > From: Jakub Kicinski > > > > This driver cannot work without MSI-X interrupts so there is no > > mechanism to fall back to. > > > > Signed-off-by: Jakub Kicinski > > Acked-by: Greg Rose > > Tested-by: Sibai Li > > Signed-off-by: Jeff Kirsher > > --- > > 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 > [...] > > @@ -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 > 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