From patchwork Tue Nov 9 20:47:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 70574 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 846A9B7124 for ; Wed, 10 Nov 2010 07:47:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754613Ab0KIUrf (ORCPT ); Tue, 9 Nov 2010 15:47:35 -0500 Received: from smtp-out.google.com ([216.239.44.51]:38053 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754326Ab0KIUrf (ORCPT ); Tue, 9 Nov 2010 15:47:35 -0500 Received: from hpaq6.eem.corp.google.com (hpaq6.eem.corp.google.com [172.25.149.6]) by smtp-out.google.com with ESMTP id oA9KlVm5001078; Tue, 9 Nov 2010 12:47:32 -0800 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1289335652; bh=rrHrERmjmBOjDMRZ0bkwtSfJw1U=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=iOC4Q56mliN8bBWqWgyvy39Mn2IGrCq1Hut1lKIc5DGuamW2oFpCYIN3Tqp5mRBTE n5Sd54lYQBjWEq4NtUMsQ== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=date:from:to:subject:message-id:user-agent:mime-version:content-type; b=W1h1+aELzmiRI+i2xQWU5QoLfNaAPUc1MLkjQGP/lehQmo6VhQKjOLGXJy8wfgO+w 4e2aO+Wj+XLoEHd8E31Bw== Received: from pokey.mtv.corp.google.com (pokey.mtv.corp.google.com [172.22.64.87]) by hpaq6.eem.corp.google.com with ESMTP id oA9KlUp1032326; Tue, 9 Nov 2010 12:47:30 -0800 Received: by pokey.mtv.corp.google.com (Postfix, from userid 60832) id 2A82F1C48FF; Tue, 9 Nov 2010 12:47:30 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by pokey.mtv.corp.google.com (Postfix) with ESMTP id 2930A1C48FA; Tue, 9 Nov 2010 12:47:30 -0800 (PST) Date: Tue, 9 Nov 2010 12:47:30 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 1/2] net: Move TX queue allocation to alloc_netdev_mq Message-ID: User-Agent: Alpine 1.00 (DEB 882 2007-12-20) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org TX queues are now allocated in alloc_netdev_mq and freed in free_netdev. Signed-off-by: Tom Herbert --- net/core/dev.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 0dd54a6..8f9c76e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5114,10 +5114,6 @@ int register_netdevice(struct net_device *dev) if (ret) goto out; - ret = netif_alloc_netdev_queues(dev); - if (ret) - goto out; - netdev_init_queues(dev); /* Init, if this function is available */ @@ -5577,6 +5573,8 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, dev->num_tx_queues = queue_count; dev->real_num_tx_queues = queue_count; + if (netif_alloc_netdev_queues(dev)) + goto free_pcpu; #ifdef CONFIG_RPS dev->num_rx_queues = queue_count; @@ -5597,6 +5595,7 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, free_pcpu: free_percpu(dev->pcpu_refcnt); + kfree(dev->_tx); free_p: kfree(p); return NULL;