diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-04-30 01:28:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-02 15:54:31 -0700 |
| commit | 6c8c44462ac8ac3f95929328f0c56e9e8b6dd524 (patch) | |
| tree | d8e8206cbcdff00eef515b5b9324aedb54a3f0da /drivers | |
| parent | d946092000698fd204d82a9d239103c656fb63bf (diff) | |
| download | linux-3.10-6c8c44462ac8ac3f95929328f0c56e9e8b6dd524.tar.gz linux-3.10-6c8c44462ac8ac3f95929328f0c56e9e8b6dd524.tar.bz2 linux-3.10-6c8c44462ac8ac3f95929328f0c56e9e8b6dd524.zip | |
Revert: veth: remove unneeded ifname code from veth_newlink()
84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743 ("veth: remove unneeded
ifname code from veth_newlink()") caused regression on veth
creation. This patch reverts the original one.
Reported-by: Michał Mirosław <mirqus@gmail.com>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/veth.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 2de9b90c5f8..3b99f64104f 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -403,6 +403,17 @@ 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; @@ -422,6 +433,7 @@ 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; |