]> Pileus Git - ~andy/linux/commitdiff
veth: remove redundant call of dev_alloc_name
authorHong zhi guo <honkiko@gmail.com>
Sun, 9 Jun 2013 12:15:20 +0000 (20:15 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Jun 2013 08:21:20 +0000 (01:21 -0700)
it's called in the following register_netdevice. No need to call it
here.
Tested with "ip link add type veth" and "ip link add xxx%d type veth".

Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/veth.c

index 177f911f59462f6770df07ff11b49b12f998dfce..da866523cf20097d57550c7357020e937782fd37 100644 (file)
@@ -379,12 +379,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
        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;
@@ -404,7 +398,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;