From patchwork Thu Jul 10 08:17:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368512 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 AF0B41400A8 for ; Thu, 10 Jul 2014 18:23:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752635AbaGJIW3 (ORCPT ); Thu, 10 Jul 2014 04:22:29 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:33694 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752318AbaGJIS7 (ORCPT ); Thu, 10 Jul 2014 04:18:59 -0400 Received: by mail-la0-f42.google.com with SMTP id pn19so5883553lab.1 for ; Thu, 10 Jul 2014 01:18:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8drsCZdh5wjM1ILG5Nxi55kFhU71Xs/ZlqyDZJGVAPk=; b=c8mRhpcsXWBkRja3yNoaAM1vtiCliJ+vBqeriSwJgM/41VUPT6Shuk67oJhYfd1RhU rgYsyTJgm8v8IN8xcRY96qpgZb30Ll1fzc9AsaTSBjmtTOSjus5zjdq1GikWkdEqoxW1 T46xDCs5aVezs4e5duF+bONh4M+u7qvlymTWycrcZKahY6sn+U9mhHK2GsRGLqj99A4k 7KpkQ2OBxt/80Ui+AZqfP3UlloyOotMp3wrsguN4+rdNpYQyM3sMZ9XxVKWvhUlrvoU4 TYj1e+8BK76ixdCzypycW+DAsziQKbKDzByo2R6UjiaFxze/wa98Xwzs9S256JLCMXxJ 4PtQ== X-Gm-Message-State: ALoCoQk5Gk/CPqzNPdeKRC3SckzdIKtkDgkyTiTWBZCLeFlgvZnP0IRwn+Pwgy4veG59Tn53rPuq X-Received: by 10.112.172.199 with SMTP id be7mr967983lbc.80.1404980338004; Thu, 10 Jul 2014 01:18:58 -0700 (PDT) Received: from localhost.localdomain (m188-149-105-114.cust.tele2.no. [188.149.105.114]) by mx.google.com with ESMTPSA id tg1sm37154793lbb.11.2014.07.10.01.18.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:57 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Chris Metcalf Subject: [PATCH v7 27/33] net: tile - set name assign type Date: Thu, 10 Jul 2014 10:17:32 +0200 Message-Id: <1404980258-30853-28-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404980258-30853-1-git-send-email-teg@jklm.no> References: <1404980258-30853-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The name is obtained from the 'hardware', so consider it predictable. Signed-off-by: Tom Gundersen Cc: Chris Metcalf Acked-by: Chris Metcalf --- drivers/net/ethernet/tile/tilegx.c | 7 ++++--- drivers/net/ethernet/tile/tilepro.c | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 69557a2..42a6cb4 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c @@ -2188,7 +2188,8 @@ static void tile_net_setup(struct net_device *dev) /* Allocate the device structure, register the device, and obtain the * MAC address from the hypervisor. */ -static void tile_net_dev_init(const char *name, const uint8_t *mac) +static void tile_net_dev_init(const char *name, unsigned char name_assign_type, + const uint8_t *mac) { int ret; struct net_device *dev; @@ -2201,7 +2202,7 @@ static void tile_net_dev_init(const char *name, const uint8_t *mac) /* Allocate the device structure. Normally, "name" is a * template, instantiated by register_netdev(), but not for us. */ - dev = alloc_netdev_mqs(sizeof(*priv), name, NET_NAME_UNKNOWN, + dev = alloc_netdev_mqs(sizeof(*priv), name, name_assign_type, tile_net_setup, NR_CPUS, 1); if (!dev) { pr_err("alloc_netdev_mqs(%s) failed\n", name); @@ -2270,7 +2271,7 @@ static int __init tile_net_init_module(void) /* Find out what devices we have, and initialize them. */ for (i = 0; gxio_mpipe_link_enumerate_mac(i, name, mac) >= 0; i++) - tile_net_dev_init(name, mac); + tile_net_dev_init(name, NET_NAME_PREDICTABLE, mac); if (!network_cpus_init()) network_cpus_map = *cpu_online_mask; diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index 88c7121..73d1e45 100644 --- a/drivers/net/ethernet/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c @@ -2281,7 +2281,8 @@ static void tile_net_setup(struct net_device *dev) * Allocate the device structure, register the device, and obtain the * MAC address from the hypervisor. */ -static struct net_device *tile_net_dev_init(const char *name) +static struct net_device *tile_net_dev_init(const char *name, + unsigned char name_assign_type) { int ret; struct net_device *dev; @@ -2292,7 +2293,7 @@ static struct net_device *tile_net_dev_init(const char *name) * tile_net_setup(), and saves "name". Normally, "name" is a * template, instantiated by register_netdev(), but not for us. */ - dev = alloc_netdev(sizeof(*priv), name, NET_NAME_UNKNOWN, + dev = alloc_netdev(sizeof(*priv), name, name_assign_type, tile_net_setup); if (!dev) { pr_err("alloc_netdev(%s) failed\n", name); @@ -2372,10 +2373,10 @@ static int tile_net_init_module(void) { pr_info("Tilera Network Driver\n"); - tile_net_devs[0] = tile_net_dev_init("xgbe0"); - tile_net_devs[1] = tile_net_dev_init("xgbe1"); - tile_net_devs[2] = tile_net_dev_init("gbe0"); - tile_net_devs[3] = tile_net_dev_init("gbe1"); + tile_net_devs[0] = tile_net_dev_init("xgbe0", NET_NAME_PREDICTABLE); + tile_net_devs[1] = tile_net_dev_init("xgbe1", NET_NAME_PREDICTABLE); + tile_net_devs[2] = tile_net_dev_init("gbe0", NET_NAME_PREDICTABLE); + tile_net_devs[3] = tile_net_dev_init("gbe1", NET_NAME_PREDICTABLE); return 0; }