]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: core: move dev_alloc_name_ns a little higher
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Sun, 12 Nov 2017 23:15:05 +0000 (00:15 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Nov 2017 07:38:46 +0000 (16:38 +0900)
No functional change.

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 1a5d31fdea273ad5a454a73a3b009b6a97151b9f..4545685d2fa713729257f8714ff695568defeead 100644 (file)
@@ -1107,6 +1107,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
@@ -1136,19 +1149,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)
 {