From patchwork Sun Nov 12 23:15:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 837294 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="erHLjIJ9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZqQn324kz9s7m for ; Mon, 13 Nov 2017 10:16:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751454AbdKLXP2 (ORCPT ); Sun, 12 Nov 2017 18:15:28 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:53009 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbdKLXP0 (ORCPT ); Sun, 12 Nov 2017 18:15:26 -0500 Received: by mail-wm0-f65.google.com with SMTP id t139so11857362wmt.1 for ; Sun, 12 Nov 2017 15:15:25 -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:in-reply-to:references; bh=vxk9Nf0O0VhMMY19V8duRyDkYJPN1nWQlia2VzLuuNE=; b=erHLjIJ97j5H5q4R62h4TMZUH0T9IchGCcCsG0L9EsFfTucrRJzg1lrM5ED20R7Qe1 xCJLFQgzoYtpFf7xi4wLywWY6fF2A6Eq9ebLFuVlEiZ66OJvjFO6z+XVt43j/WQBkeIi yN3TayHSJZ2IxtueIAEybZZ18HisooKs742Cs= 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:in-reply-to :references; bh=vxk9Nf0O0VhMMY19V8duRyDkYJPN1nWQlia2VzLuuNE=; b=Pl4JxZyz6C2IHoi01M95+tnRz53B6ZADDy4vRpqsK3Cfi4mkqiUNRWhnyl7eVCPsTG ot30mI9jtAzL8a/Z3H3AtRxkln33Yu0WDTqyB6iYVBH/zkmWZtSqX/qoGKZtghlXIOMT popQHkx31SXHuHbC3mDyu8gdn7+Lg1HKpXEnx61i2Y16R3ajwptZKz0dGI7K9/Lg3WkH JFPrWi6gCORxfNucoEL0SB8s99xrM+Sma2eztLD4D9fqKIg0W+2hxgfFz8AqR4cDOlqJ BZMsC5cS9bA3JhIoT6zFKu4GQC2gCNMQj72miDmbsCkUqXbdwwUJLZ9mmIUhzQHj1H+n 8Emw== X-Gm-Message-State: AJaThX7MCGDaLUXN0oftOAJfHxXRiVDmpBME1ZMnbBQILMNysuXDe9ky xgCja4EN6YyYPX6o0FVVAi/zWQ== X-Google-Smtp-Source: AGs4zMaKDH92d4QGPqEz0/nKU2lYt50VSzqgSXZ1GFQ5ZIh+AmlludXMxz8rN/fWFa1FocLK3+5ptQ== X-Received: by 10.28.16.149 with SMTP id 143mr5298596wmq.62.1510528524899; Sun, 12 Nov 2017 15:15:24 -0800 (PST) Received: from wildmoose.dk ([2a01:488:66:1000:57e6:57d1:0:1]) by smtp.gmail.com with ESMTPSA id o70sm48012169wrb.62.2017.11.12.15.15.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 15:15:24 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] net: core: move dev_alloc_name_ns a little higher Date: Mon, 13 Nov 2017 00:15:05 +0100 Message-Id: <20171112231511.4666-3-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171112231511.4666-1-linux@rasmusvillemoes.dk> References: <20171112231511.4666-1-linux@rasmusvillemoes.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No functional change. Signed-off-by: Rasmus Villemoes --- net/core/dev.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 87e19804757b..240ae6bc1097 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1105,6 +1105,19 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) return -ENFILE; } +static int dev_alloc_name_ns(struct net *net, + struct net_device *dev, + const char *name) +{ + char buf[IFNAMSIZ]; + int ret; + + ret = __dev_alloc_name(net, name, buf); + if (ret >= 0) + strlcpy(dev->name, buf, IFNAMSIZ); + return ret; +} + /** * dev_alloc_name - allocate a name for a device * @dev: device @@ -1134,19 +1147,6 @@ int dev_alloc_name(struct net_device *dev, const char *name) } EXPORT_SYMBOL(dev_alloc_name); -static int dev_alloc_name_ns(struct net *net, - struct net_device *dev, - const char *name) -{ - char buf[IFNAMSIZ]; - int ret; - - ret = __dev_alloc_name(net, name, buf); - if (ret >= 0) - strlcpy(dev->name, buf, IFNAMSIZ); - return ret; -} - int dev_get_valid_name(struct net *net, struct net_device *dev, const char *name) {