diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-04-29 21:21:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-05 13:57:45 -0400 |
commit | 1c5cae815d19ffe02bdfda1260949ef2b1806171 (patch) | |
tree | d47a73c05afacd21985abb8df9862136385c58f0 /drivers/ieee802154/fakehard.c | |
parent | e8920674979705392abc4db4ebbe78feb68a4da1 (diff) |
net: call dev_alloc_name from register_netdevice
Force dev_alloc_name() to be called from register_netdevice() by
dev_get_valid_name(). That allows to remove multiple explicit
dev_alloc_name() calls.
The possibility to call dev_alloc_name in advance remains.
This also fixes veth creation regresion caused by
84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ieee802154/fakehard.c')
-rw-r--r-- | drivers/ieee802154/fakehard.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c index d9d0e13efe47..a5a49a1baae7 100644 --- a/drivers/ieee802154/fakehard.c +++ b/drivers/ieee802154/fakehard.c | |||
@@ -393,16 +393,6 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev) | |||
393 | priv = netdev_priv(dev); | 393 | priv = netdev_priv(dev); |
394 | priv->phy = phy; | 394 | priv->phy = phy; |
395 | 395 | ||
396 | /* | ||
397 | * If the name is a format string the caller wants us to do a | ||
398 | * name allocation. | ||
399 | */ | ||
400 | if (strchr(dev->name, '%')) { | ||
401 | err = dev_alloc_name(dev, dev->name); | ||
402 | if (err < 0) | ||
403 | goto out; | ||
404 | } | ||
405 | |||
406 | wpan_phy_set_dev(phy, &pdev->dev); | 396 | wpan_phy_set_dev(phy, &pdev->dev); |
407 | SET_NETDEV_DEV(dev, &phy->dev); | 397 | SET_NETDEV_DEV(dev, &phy->dev); |
408 | 398 | ||