Skip to content

Commit

Permalink
veth: remove unneeded ifname code from veth_newlink()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jan 25, 2011
1 parent acd1130 commit 84c49d8
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions drivers/net/veth.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,17 +403,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
if (tb[IFLA_ADDRESS] == NULL)
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);
if (err < 0)
goto err_register_dev;
Expand All @@ -433,7 +422,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,

err_register_dev:
/* nothing to do */
err_alloc_name:
err_configure_peer:
unregister_netdevice(peer);
return err;
Expand Down

0 comments on commit 84c49d8

Please sign in to comment.