From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752033AbdKUAfQ (ORCPT ); Mon, 20 Nov 2017 19:35:16 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:33350 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299AbdKUAfN (ORCPT ); Mon, 20 Nov 2017 19:35:13 -0500 X-Google-Smtp-Source: AGs4zMZzWymw+KR33zW+Mx1R89zToGk8HEHCkq8120mITAnMC4vv47/IAV3KyJNzDN3tu5M7t9wqEg== From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] net: core: export dev_alloc_name_ns Date: Tue, 21 Nov 2017 01:34:37 +0100 Message-Id: <20171121003439.10974-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org dev_alloc_name_ns and dev_get_valid_name now do exactly the same thing. Let's expose this functionality as dev_alloc_name_ns (obviously, a core function like this won't return an invalid name...). Signed-off-by: Rasmus Villemoes --- include/linux/netdevice.h | 1 + net/core/dev.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6b274bfe489f..e249d3d0ff85 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2447,6 +2447,7 @@ struct net_device *dev_get_by_name(struct net *net, const char *name); struct net_device *dev_get_by_name_rcu(struct net *net, const char *name); struct net_device *__dev_get_by_name(struct net *net, const char *name); int dev_alloc_name(struct net_device *dev, const char *name); +int dev_alloc_name_ns(struct net *net, struct net_device *dev, const char *name); int dev_open(struct net_device *dev); void dev_close(struct net_device *dev); void dev_close_many(struct list_head *head, bool unlink); diff --git a/net/core/dev.c b/net/core/dev.c index 8ee29f4f5fa9..9575e7329823 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1109,9 +1109,9 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) return p ? -ENFILE : -EEXIST; } -static int dev_alloc_name_ns(struct net *net, - struct net_device *dev, - const char *name) +int dev_alloc_name_ns(struct net *net, + struct net_device *dev, + const char *name) { char buf[IFNAMSIZ]; int ret; @@ -1122,6 +1122,7 @@ static int dev_alloc_name_ns(struct net *net, strlcpy(dev->name, buf, IFNAMSIZ); return ret; } +EXPORT_SYMBOL(dev_alloc_name_ns); /** * dev_alloc_name - allocate a name for a device -- 2.11.0