aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2019-10-08 14:20:34 -0700
committerJakub Kicinski <jakub.kicinski@netronome.com>2019-10-08 20:49:15 -0700
commitbacb7e1855969bba78b32302453d2cc8ba0bc403 (patch)
treec42cf1047792072d8abadd88e78d22cda429051f /drivers/net/tun.c
parentnet: tipc: prepare attrs in __tipc_nl_compat_dumpit() (diff)
downloadlinux-dev-bacb7e1855969bba78b32302453d2cc8ba0bc403.tar.xz
linux-dev-bacb7e1855969bba78b32302453d2cc8ba0bc403.zip
Revert "tun: call dev_get_valid_name() before register_netdevice()"
This reverts commit 0ad646c81b2182f7fa67ec0c8c825e0ee165696d. As noticed by Jakub, this is no longer needed after commit 11fc7d5a0a2d ("tun: fix memory leak in error path") This no longer exports dev_get_valid_name() for the exclusive use of tun driver. Suggested-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 1e541b08b136..0413d182d782 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2788,9 +2788,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
if (!dev)
return -ENOMEM;
- err = dev_get_valid_name(net, dev, name);
- if (err < 0)
- goto err_free_dev;
dev_net_set(dev, net);
dev->rtnl_link_ops = &tun_link_ops;