diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-04-30 05:21:32 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 21:57:45 +0400 |
| commit | 1c5cae815d19ffe02bdfda1260949ef2b1806171 (patch) | |
| tree | d47a73c05afacd21985abb8df9862136385c58f0 /drivers/net/wan/dlci.c | |
| parent | e8920674979705392abc4db4ebbe78feb68a4da1 (diff) | |
| download | linux-1c5cae815d19ffe02bdfda1260949ef2b1806171.tar.xz | |
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/net/wan/dlci.c')
| -rw-r--r-- | drivers/net/wan/dlci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index 1481a446fefb..21b104db5a90 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c @@ -341,10 +341,6 @@ static int dlci_add(struct dlci_add *dlci) } } - err = dev_alloc_name(master, master->name); - if (err < 0) - goto err2; - *(short *)(master->dev_addr) = dlci->dlci; dlp = netdev_priv(master); |