From patchwork Mon Sep 27 18:29:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 65900 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 3CB25B70CE for ; Tue, 28 Sep 2010 04:30:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933329Ab0I0S3l (ORCPT ); Mon, 27 Sep 2010 14:29:41 -0400 Received: from mail.solarflare.com ([216.237.3.220]:51979 "EHLO exchange.solarflare.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933309Ab0I0S3h (ORCPT ); Mon, 27 Sep 2010 14:29:37 -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:29:37 -0700 Subject: [PATCH net-next-2.6 11/17] mlx4_en: Use netif_set_real_num_{rx,tx}_queues() From: Ben Hutchings To: David Miller Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com, Yevgeny Petrilin 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:29:34 +0100 Message-ID: <1285612174.2263.309.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:29:37.0396 (UTC) FILETIME=[F0C52B40:01CB5E71] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-6.500.1024-17668.005 X-TM-AS-Result: No--0.109300-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/mlx4/en_netdev.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c index 411bda5..79478bd 100644 --- a/drivers/net/mlx4/en_netdev.c +++ b/drivers/net/mlx4/en_netdev.c @@ -1025,7 +1025,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, */ dev->netdev_ops = &mlx4_netdev_ops; dev->watchdog_timeo = MLX4_EN_WATCHDOG_TIMEOUT; - dev->real_num_tx_queues = MLX4_EN_NUM_TX_RINGS; + netif_set_real_num_tx_queues(dev, priv->tx_ring_num); + netif_set_real_num_rx_queues(dev, priv->rx_ring_num); SET_ETHTOOL_OPS(dev, &mlx4_en_ethtool_ops);