From patchwork Thu Jul 10 08:17:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368510 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 A6CA31400A8 for ; Thu, 10 Jul 2014 18:21:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752594AbaGJIVo (ORCPT ); Thu, 10 Jul 2014 04:21:44 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:37968 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752316AbaGJITB (ORCPT ); Thu, 10 Jul 2014 04:19:01 -0400 Received: by mail-lb0-f172.google.com with SMTP id c11so5891653lbj.3 for ; Thu, 10 Jul 2014 01:19:00 -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=4IORrnukPWxYQo8xbgyHxXe74kaJYvxVcGrAXa80K6M=; b=VOIABTtLpEL4RsdGulnLbsn8yCepFzg4N3b6bl+a/KBHIcRxLlM0h3gEf3fCcNH6tQ SHRFcAmv1Yb3/25jDID/Z+TwoKPWk3LQorO5eZCfSaZMZVaFkKtoa9iSYVfVlVD82UZT 6OreD0vKpYSD7KvO+lB5v0VVAakwW9zS43l6dSUHs7blZI3CcouNBIn+RqPLGd6fvIR9 OXAAWpsCJjKQ5MwDvBv1dUsfqpyNZAer3+9tNpvOkcW0JMX536AD87DjfLUjFT34bof7 SWwuMo3Th6wR82RGIripqj2EvfNowM2n9chmPBMia0zLLc3nTW19MqIayciAHFB7eWLg UBfQ== X-Gm-Message-State: ALoCoQnxwzeB7Y/ewcDYkxChptj3igMwDxDS3622AGbyyTBX18rLGzi5kCUdTgCrIZJYATqlU6kN X-Received: by 10.112.17.102 with SMTP id n6mr2885705lbd.39.1404980340121; Thu, 10 Jul 2014 01:19:00 -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.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:59 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Fabian Godehardt , Florian Fainelli Subject: [PATCH v7 28/33] net: dsa - set name assign type Date: Thu, 10 Jul 2014 10:17:33 +0200 Message-Id: <1404980258-30853-29-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 given by the firmware, so we assume it is predictable. Signed-off-by: Tom Gundersen Cc: Fabian Godehardt Cc: Florian Fainelli --- net/dsa/dsa.c | 3 ++- net/dsa/dsa_priv.h | 3 ++- net/dsa/slave.c | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 5db37ce..f3cd203 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -185,7 +185,8 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, if (!(ds->phys_port_mask & (1 << i))) continue; - slave_dev = dsa_slave_create(ds, parent, i, pd->port_names[i]); + slave_dev = dsa_slave_create(ds, parent, i, pd->port_names[i], + NET_NAME_PREDICTABLE); if (slave_dev == NULL) { printk(KERN_ERR "%s[%d]: can't create dsa " "slave device for port %d(%s)\n", diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index d4cf5cc..458881f 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -42,7 +42,8 @@ extern char dsa_driver_version[]; void dsa_slave_mii_bus_init(struct dsa_switch *ds); struct net_device *dsa_slave_create(struct dsa_switch *ds, struct device *parent, - int port, char *name); + int port, char *name, + unsigned char name_assign_type); /* tag_dsa.c */ netdev_tx_t dsa_xmit(struct sk_buff *skb, struct net_device *dev); diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 45a1e34..d29b0be 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -333,15 +333,15 @@ static const struct net_device_ops trailer_netdev_ops = { /* slave device setup *******************************************************/ struct net_device * dsa_slave_create(struct dsa_switch *ds, struct device *parent, - int port, char *name) + int port, char *name, unsigned char name_assign_type) { struct net_device *master = ds->dst->master_netdev; struct net_device *slave_dev; struct dsa_slave_priv *p; int ret; - slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name, - NET_NAME_UNKNOWN, ether_setup); + slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), + name, name_assign_type, ether_setup); if (slave_dev == NULL) return slave_dev;