From patchwork Thu Jul 10 08:17:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368526 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 DC199140119 for ; Thu, 10 Jul 2014 18:31:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752148AbaGJIS1 (ORCPT ); Thu, 10 Jul 2014 04:18:27 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:55949 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752108AbaGJISP (ORCPT ); Thu, 10 Jul 2014 04:18:15 -0400 Received: by mail-lb0-f178.google.com with SMTP id 10so5872659lbg.9 for ; Thu, 10 Jul 2014 01:18:14 -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=muYN3DO9YANiUr51XRARhxvDt2ne7rFtc6OUa3UutkE=; b=ImNMNhPXCfYnXC9ygddLC/ha6XiXoCavZjP6b9X8h8HmaCMQYhOdwxC3mldIVNeFJN +W0BDo0LrqpbfsVyEOXFDNuJ/ebw8CDOQ/Qxq3jRkNdKN2GWWkaHjAfPjp6omI8MG2am tkRuHCZGcxmcjt6rIaodQAMIlc1X1LQEE+FhGiB5gvMXWQ92xH18wu83fK/X/08aYmaD c9hDo6ptb4YXkRWxyWzj/ecTdAabN97EjxuQXCLn27gOZhA2d92HI4F8y34PiWOWLtN6 GW4TpT6uHSFeIXjyjl1D66W2PzpxS0/XSklFkOS1vzOm8crFtKg1NX4K5mYsjlm3BUF8 ED3w== X-Gm-Message-State: ALoCoQn6EBV1QxnCfYayha8MTCbAB2oQ5jp/sACAUp4O9N5pPrPOPlzkMFe8CWpf0El0gcTTnLxh X-Received: by 10.112.156.161 with SMTP id wf1mr14821324lbb.1.1404980294278; Thu, 10 Jul 2014 01:18:14 -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.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:13 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen Subject: [PATCH v7 07/33] net: rtnetlink - make create_link take name_assign_type Date: Thu, 10 Jul 2014 10:17:12 +0200 Message-Id: <1404980258-30853-8-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 Signed-off-by: Tom Gundersen --- drivers/net/veth.c | 11 ++++++++--- include/net/rtnetlink.h | 1 + net/core/rtnetlink.c | 12 ++++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index b4a10bc..5058700 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -319,6 +319,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, struct nlattr *peer_tb[IFLA_MAX + 1], **tbp; struct ifinfomsg *ifmp; struct net *net; + unsigned char name_assign_type; /* * create and register peer first @@ -344,16 +345,20 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, tbp = tb; } - if (tbp[IFLA_IFNAME]) + if (tbp[IFLA_IFNAME]) { nla_strlcpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ); - else + name_assign_type = NET_NAME_USER; + } else { snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d"); + name_assign_type = NET_NAME_ENUM; + } net = rtnl_link_get_net(src_net, tbp); if (IS_ERR(net)) return PTR_ERR(net); - peer = rtnl_create_link(net, ifname, &veth_link_ops, tbp); + peer = rtnl_create_link(net, ifname, name_assign_type, + &veth_link_ops, tbp); if (IS_ERR(peer)) { put_net(net); return PTR_ERR(peer); diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h index 72240e5..e21b9f9 100644 --- a/include/net/rtnetlink.h +++ b/include/net/rtnetlink.h @@ -136,6 +136,7 @@ void rtnl_af_unregister(struct rtnl_af_ops *ops); struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]); struct net_device *rtnl_create_link(struct net *net, char *ifname, + unsigned char name_assign_type, const struct rtnl_link_ops *ops, struct nlattr *tb[]); int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm); diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 899de40..09456ff 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1805,7 +1805,8 @@ int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm) EXPORT_SYMBOL(rtnl_configure_link); struct net_device *rtnl_create_link(struct net *net, - char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]) + char *ifname, unsigned char name_assign_type, + const struct rtnl_link_ops *ops, struct nlattr *tb[]) { int err; struct net_device *dev; @@ -1823,7 +1824,7 @@ struct net_device *rtnl_create_link(struct net *net, num_rx_queues = ops->get_num_rx_queues(); err = -ENOMEM; - dev = alloc_netdev_mqs(ops->priv_size, ifname, NET_NAME_UNKNOWN, + dev = alloc_netdev_mqs(ops->priv_size, ifname, name_assign_type, ops->setup, num_tx_queues, num_rx_queues); if (!dev) goto err; @@ -1889,6 +1890,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh) char ifname[IFNAMSIZ]; struct nlattr *tb[IFLA_MAX+1]; struct nlattr *linkinfo[IFLA_INFO_MAX+1]; + unsigned char name_assign_type = NET_NAME_USER; int err; #ifdef CONFIG_MODULES @@ -2038,14 +2040,16 @@ replay: return -EOPNOTSUPP; } - if (!ifname[0]) + if (!ifname[0]) { snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind); + name_assign_type = NET_NAME_ENUM; + } dest_net = rtnl_link_get_net(net, tb); if (IS_ERR(dest_net)) return PTR_ERR(dest_net); - dev = rtnl_create_link(dest_net, ifname, ops, tb); + dev = rtnl_create_link(dest_net, ifname, name_assign_type, ops, tb); if (IS_ERR(dev)) { err = PTR_ERR(dev); goto out;