From patchwork Mon Sep 27 18:25:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 65893 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 33388B6F01 for ; Tue, 28 Sep 2010 04:25:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760032Ab0I0SZb (ORCPT ); Mon, 27 Sep 2010 14:25:31 -0400 Received: from exchange.solarflare.com ([216.237.3.220]:51155 "EHLO exchange.solarflare.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757174Ab0I0SZb (ORCPT ); Mon, 27 Sep 2010 14:25:31 -0400 Received: from [10.17.20.50] ([10.17.20.50]) by exchange.solarflare.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 27 Sep 2010 11:25:30 -0700 Subject: [PATCH net-next-2.6 04/17] bnx2x: Use netif_set_real_num_{rx,tx}_queues() From: Ben Hutchings To: David Miller Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com, Eilon Greenstein In-Reply-To: <1285611791.2263.287.camel@achroite.uk.solarflarecom.com> References: <1285611791.2263.287.camel@achroite.uk.solarflarecom.com> Organization: Solarflare Communications Date: Mon, 27 Sep 2010 19:25:27 +0100 Message-ID: <1285611927.2263.296.camel@achroite.uk.solarflarecom.com> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 (2.30.2-4.fc13) X-OriginalArrivalTime: 27 Sep 2010 18:25:30.0754 (UTC) FILETIME=[5DC29620:01CB5E71] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-6.500.1024-17668.005 X-TM-AS-Result: No--0.060500-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Ben Hutchings --- drivers/net/bnx2x/bnx2x_cmn.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index efc7be4..05c05a4 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c @@ -1207,8 +1207,8 @@ static int bnx2x_set_num_queues(struct bnx2x *bp) bp->num_queues = 1; break; } - bp->dev->real_num_tx_queues = bp->num_queues; - return rc; + netif_set_real_num_tx_queues(bp->dev, bp->num_queues); + return netif_set_real_num_rx_queues(bp->dev, bp->num_queues); } static void bnx2x_release_firmware(struct bnx2x *bp) @@ -1240,6 +1240,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) bp->state = BNX2X_STATE_OPENING_WAIT4_LOAD; rc = bnx2x_set_num_queues(bp); + if (rc) + return rc; if (bnx2x_alloc_mem(bp)) { bnx2x_free_irq(bp, true);