diff options
-rw-r--r-- | drivers/net/veth.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index cc83fa71c3ff..105d7f0630cc 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
@@ -403,17 +403,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, | |||
403 | if (tb[IFLA_ADDRESS] == NULL) | 403 | if (tb[IFLA_ADDRESS] == NULL) |
404 | random_ether_addr(dev->dev_addr); | 404 | random_ether_addr(dev->dev_addr); |
405 | 405 | ||
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 | |||
417 | err = register_netdevice(dev); | 406 | err = register_netdevice(dev); |
418 | if (err < 0) | 407 | if (err < 0) |
419 | goto err_register_dev; | 408 | goto err_register_dev; |
@@ -433,7 +422,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, | |||
433 | 422 | ||
434 | err_register_dev: | 423 | err_register_dev: |
435 | /* nothing to do */ | 424 | /* nothing to do */ |
436 | err_alloc_name: | ||
437 | err_configure_peer: | 425 | err_configure_peer: |
438 | unregister_netdevice(peer); | 426 | unregister_netdevice(peer); |
439 | return err; | 427 | return err; |