From patchwork Thu Jul 17 08:06:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 371010 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 1519914010C for ; Thu, 17 Jul 2014 18:12:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755358AbaGQIMw (ORCPT ); Thu, 17 Jul 2014 04:12:52 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:59112 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754154AbaGQIMg (ORCPT ); Thu, 17 Jul 2014 04:12:36 -0400 Received: by mail-wi0-f182.google.com with SMTP id d1so2590028wiv.9 for ; Thu, 17 Jul 2014 01:12:33 -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=COCzNT2oca3bVT+AwsZm348P5KZr9JQazyo1caZeD1w=; b=cz9aQkIrFZY+JuASZONsfeWV2IZGCsDRTMWPOASGzsN3+T8Cgqnh6KBl/WYnmMUjQz fwzZrTUeYFjQPGE34IUf6kHoU1k6U1Dm8+YgGQSuGasEnGJdIgW6JcOlGrdO+bSH+TwM YbpZ0378OnMpIPn8hQj+8HKshibF6CNbNrEdp1GCeR7agK5QibMOO2CkPYr51ZRA3F6Y VnLRfznGF0Tox2FkceGmO56VkA96Fxpt+XY2d7NlgxTS8yLtnF5hBr9hcHcU3Mf61FFa xjPMe/KiU6ComYSQmudwagAo1ulUipGPzbRVF/nYr4yYe7JiUfH7Bd1qVTBDH1ta0Wcd xLUg== X-Gm-Message-State: ALoCoQmgjkCuovDSe3u/T9cKKwwROrA2UpA22LU4CJBzGmMgcMXoIbqelNB5tjBT/Qpi+7bedKtt X-Received: by 10.194.83.39 with SMTP id n7mr43196065wjy.58.1405584388366; Thu, 17 Jul 2014 01:06:28 -0700 (PDT) Received: from tomegun-x240.localdomain (cm-84.208.72.173.getinternet.no. [84.208.72.173]) by mx.google.com with ESMTPSA id ch5sm4297467wjb.18.2014.07.17.01.06.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 01:06:27 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen Subject: [PATCH net-next v9 4/9] net: set name_assign_type when setting names via ioctls Date: Thu, 17 Jul 2014 10:06:05 +0200 Message-Id: <1405584370-30054-5-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405584370-30054-1-git-send-email-teg@jklm.no> References: <1405584370-30054-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the user provides a name, set NET_NAME_USER, otherwise an enumerated name is used, so set NET_NAME_ENUM. Signed-off-by: Tom Gundersen --- drivers/net/tun.c | 9 ++++++--- drivers/tty/n_gsm.c | 10 +++++++--- net/atm/br2684.c | 5 +++-- net/bluetooth/bnep/core.c | 2 +- net/bridge/br_if.c | 7 ++++--- net/bridge/br_ioctl.c | 4 ++-- net/bridge/br_private.h | 2 +- 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index acaaf67..eac34f5 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1607,6 +1607,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) } else { char *name; + unsigned char name_assign_type = NET_NAME_ENUM; unsigned long flags = 0; int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ? MAX_TAP_QUEUES : 1; @@ -1629,12 +1630,14 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) } else return -EINVAL; - if (*ifr->ifr_name) + if (*ifr->ifr_name) { name = ifr->ifr_name; + name_assign_type = NET_NAME_USER; + } dev = alloc_netdev_mqs(sizeof(struct tun_struct), name, - NET_NAME_UNKNOWN, tun_setup, queues, - queues); + name_assign_type, tun_setup, + queues, queues); if (!dev) return -ENOMEM; diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index cde3ab9..d0262d9 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -2767,6 +2767,7 @@ static void gsm_destroy_network(struct gsm_dlci *dlci) static int gsm_create_network(struct gsm_dlci *dlci, struct gsm_netconfig *nc) { char *netname; + unsigned char name_assign_type = NET_NAME_ENUM; int retval = 0; struct net_device *net; struct gsm_mux_net *mux_net; @@ -2787,10 +2788,13 @@ static int gsm_create_network(struct gsm_dlci *dlci, struct gsm_netconfig *nc) pr_debug("create network interface"); netname = "gsm%d"; - if (nc->if_name[0] != '\0') + if (nc->if_name[0] != '\0') { netname = nc->if_name; - net = alloc_netdev(sizeof(struct gsm_mux_net), netname, - NET_NAME_UNKNOWN, gsm_mux_net_init); + name_assign_type = NET_NAME_USER; + } + net = alloc_netdev(sizeof(struct gsm_mux_net), + netname, name_assign_type, + gsm_mux_net_init); if (!net) { pr_err("alloc_netdev failed"); return -ENOMEM; diff --git a/net/atm/br2684.c b/net/atm/br2684.c index cc78538..cb8d122 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -682,8 +682,9 @@ static int br2684_create(void __user *arg) netdev = alloc_netdev(sizeof(struct br2684_dev), ni.ifname[0] ? ni.ifname : "nas%d", - NET_NAME_UNKNOWN, - (payload == p_routed) ? br2684_setup_routed : br2684_setup); + ni.ifname[0] ? NET_NAME_USER : NET_NAME_ENUM, + (payload == p_routed) ? + br2684_setup_routed : br2684_setup); if (!netdev) return -ENOMEM; diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 85bcc21..6bed7b3 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c @@ -539,7 +539,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock) /* session struct allocated as private part of net_device */ dev = alloc_netdev(sizeof(struct bnep_session), (*req->device) ? req->device : "bnep%d", - NET_NAME_UNKNOWN, + (*req->device) ? NET_NAME_USER : NET_NAME_ENUM, bnep_net_setup); if (!dev) return -ENOMEM; diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 078d336..f9c6766 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -339,13 +339,14 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br, return p; } -int br_add_bridge(struct net *net, const char *name) +int br_add_bridge(struct net *net, const char *name, + unsigned char name_assign_type) { struct net_device *dev; int res; - dev = alloc_netdev(sizeof(struct net_bridge), name, NET_NAME_UNKNOWN, - br_dev_setup); + dev = alloc_netdev(sizeof(struct net_bridge), name, + name_assign_type, br_dev_setup); if (!dev) return -ENOMEM; diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index a9a4a1b..bdc79a1 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -340,7 +340,7 @@ static int old_deviceless(struct net *net, void __user *uarg) buf[IFNAMSIZ-1] = 0; if (args[0] == BRCTL_ADD_BRIDGE) - return br_add_bridge(net, buf); + return br_add_bridge(net, buf, NET_NAME_USER); return br_del_bridge(net, buf); } @@ -369,7 +369,7 @@ int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *uar buf[IFNAMSIZ-1] = 0; if (cmd == SIOCBRADDBR) - return br_add_bridge(net, buf); + return br_add_bridge(net, buf, NET_NAME_USER); return br_del_bridge(net, buf); } diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 62a7fa2..5adc136 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -415,7 +415,7 @@ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb, /* br_if.c */ void br_port_carrier_check(struct net_bridge_port *p); -int br_add_bridge(struct net *net, const char *name); +int br_add_bridge(struct net *net, const char *name, unsigned char name_assign_type); int br_del_bridge(struct net *net, const char *name); int br_add_if(struct net_bridge *br, struct net_device *dev); int br_del_if(struct net_bridge *br, struct net_device *dev);