mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
veth: remove unneeded ifname code from veth_newlink()
The code is not needed because tb[IFLA_IFNAME] is already processed in rtnl_newlink(). Remove this redundancy. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
acd1130e87
commit
84c49d8c3e
1 changed files with 0 additions and 12 deletions
|
@ -403,17 +403,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
|
||||||
if (tb[IFLA_ADDRESS] == NULL)
|
if (tb[IFLA_ADDRESS] == NULL)
|
||||||
random_ether_addr(dev->dev_addr);
|
random_ether_addr(dev->dev_addr);
|
||||||
|
|
||||||
if (tb[IFLA_IFNAME])
|
|
||||||
nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ);
|
|
||||||
else
|
|
||||||
snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
|
|
||||||
|
|
||||||
if (strchr(dev->name, '%')) {
|
|
||||||
err = dev_alloc_name(dev, dev->name);
|
|
||||||
if (err < 0)
|
|
||||||
goto err_alloc_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
err = register_netdevice(dev);
|
err = register_netdevice(dev);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto err_register_dev;
|
goto err_register_dev;
|
||||||
|
@ -433,7 +422,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
|
||||||
|
|
||||||
err_register_dev:
|
err_register_dev:
|
||||||
/* nothing to do */
|
/* nothing to do */
|
||||||
err_alloc_name:
|
|
||||||
err_configure_peer:
|
err_configure_peer:
|
||||||
unregister_netdevice(peer);
|
unregister_netdevice(peer);
|
||||||
return err;
|
return err;
|
||||||
|
|
Loading…
Reference in a new issue