From patchwork Tue Nov 21 00:34:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 839872 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="diI62HS8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygmpV4jg8z9ryT for ; Tue, 21 Nov 2017 11:35:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751980AbdKUAfP (ORCPT ); Mon, 20 Nov 2017 19:35:15 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:43358 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751942AbdKUAfN (ORCPT ); Mon, 20 Nov 2017 19:35:13 -0500 Received: by mail-wr0-f195.google.com with SMTP id u40so9715907wrf.10 for ; Mon, 20 Nov 2017 16:35:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id; bh=3tWNT+WB145JJN2jcccpEvTRA+oMgXhPM7mxoK7ndr8=; b=diI62HS8PaYPWDzm8kQNsy3/7S10K9Er1zRtk65xsibIiSe7HbKGXQOgb8OXoyZbTx tjqGvJDbjBFcfjed6PE1mLE5T6VVYUGmsbp+g5RMHjCBNsvOxEIUYWKshfOMci2si+x6 8yOQqmXwsUj5/el9VZ3Axb3fOeZ1/mcsMsOEw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3tWNT+WB145JJN2jcccpEvTRA+oMgXhPM7mxoK7ndr8=; b=tmjqAk/uZKN7hgBxFQ7o+CGJ7GP+6lvBZ+kaD0tL+N6tz7ar/gto3DWaUbWJyW1MLP XY+btuC8gr7K3dCZ3BAbaF9OEqoF9dqH141UCuM43h4ZN28HmMuF7GpTnhoJT1EzSP/K MbCVKbh0G80eY4V56WAZnlvkIu/AARm35ZnqvBLm2ciBrMe0ZG9OFqyTRj0qOiRr2rOU F9lDxojzA1rPawYuTRrQ1V/FptaxvVLgAi2mbo8Wm8Eptn6x7CF+opJkQiFEQE8qPB2D LNc7eUXGIz3GQlPPfDJGbPNeE1M38bkn3Pqinc8SGww9iXMdPUsLJEcqTZvKl26iJE/N wjow== X-Gm-Message-State: AJaThX6m2CruFye8oqeXOwYnCl7VV1VROGkoqfmCMXijhLB44W87juff jNc8UrbKp1x2wqBTX94Y16qbKplQ X-Google-Smtp-Source: AGs4zMZzWymw+KR33zW+Mx1R89zToGk8HEHCkq8120mITAnMC4vv47/IAV3KyJNzDN3tu5M7t9wqEg== X-Received: by 10.223.157.137 with SMTP id p9mr13419247wre.92.1511224512041; Mon, 20 Nov 2017 16:35:12 -0800 (PST) Received: from wildmoose.dk ([2a01:488:66:1000:57e6:57d1:0:1]) by smtp.gmail.com with ESMTPSA id r63sm16353527wmg.13.2017.11.20.16.35.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 16:35:11 -0800 (PST) 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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