Skip to content

Commit 84c49d8

Browse files
Jiri Pirkodavem330
authored andcommitted
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>
1 parent acd1130 commit 84c49d8

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

drivers/net/veth.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -403,17 +403,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
403403
if (tb[IFLA_ADDRESS] == NULL)
404404
random_ether_addr(dev->dev_addr);
405405

406-
if (tb[IFLA_IFNAME])
407-
nla_strlcpy(dev->name, tb[IFLA_IFNAME], IFNAMSIZ);
408-
else
409-
snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
410-
411-
if (strchr(dev->name, '%')) {
412-
err = dev_alloc_name(dev, dev->name);
413-
if (err < 0)
414-
goto err_alloc_name;
415-
}
416-
417406
err = register_netdevice(dev);
418407
if (err < 0)
419408
goto err_register_dev;
@@ -433,7 +422,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
433422

434423
err_register_dev:
435424
/* nothing to do */
436-
err_alloc_name:
437425
err_configure_peer:
438426
unregister_netdevice(peer);
439427
return err;

0 commit comments

Comments
 (0)