Просмотр исходного кода

veth: remove redundant call of dev_alloc_name

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>
Hong zhi guo 12 лет назад
Родитель
Сommit
3f8b96379a
1 измененных файлов с 0 добавлено и 7 удалено
  1. 0 7
      drivers/net/veth.c

+ 0 - 7
drivers/net/veth.c

@@ -379,12 +379,6 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,
 	else
 	else
 		snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d");
 		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;
@@ -404,7 +398,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;