diff options
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/dlci.c | 4 | ||||
-rw-r--r-- | drivers/net/wan/hdlc_fr.c | 9 | ||||
-rw-r--r-- | drivers/net/wan/lapbether.c | 4 |
3 files changed, 1 insertions, 16 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) | |||
341 | } | 341 | } |
342 | } | 342 | } |
343 | 343 | ||
344 | err = dev_alloc_name(master, master->name); | ||
345 | if (err < 0) | ||
346 | goto err2; | ||
347 | |||
348 | *(short *)(master->dev_addr) = dlci->dlci; | 344 | *(short *)(master->dev_addr) = dlci->dlci; |
349 | 345 | ||
350 | dlp = netdev_priv(master); | 346 | dlp = netdev_priv(master); |
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index 0edb535bb2b5..fc433f28c047 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c | |||
@@ -1070,7 +1070,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) | |||
1070 | hdlc_device *hdlc = dev_to_hdlc(frad); | 1070 | hdlc_device *hdlc = dev_to_hdlc(frad); |
1071 | pvc_device *pvc; | 1071 | pvc_device *pvc; |
1072 | struct net_device *dev; | 1072 | struct net_device *dev; |
1073 | int result, used; | 1073 | int used; |
1074 | 1074 | ||
1075 | if ((pvc = add_pvc(frad, dlci)) == NULL) { | 1075 | if ((pvc = add_pvc(frad, dlci)) == NULL) { |
1076 | printk(KERN_WARNING "%s: Memory squeeze on fr_add_pvc()\n", | 1076 | printk(KERN_WARNING "%s: Memory squeeze on fr_add_pvc()\n", |
@@ -1106,13 +1106,6 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) | |||
1106 | dev->tx_queue_len = 0; | 1106 | dev->tx_queue_len = 0; |
1107 | dev->ml_priv = pvc; | 1107 | dev->ml_priv = pvc; |
1108 | 1108 | ||
1109 | result = dev_alloc_name(dev, dev->name); | ||
1110 | if (result < 0) { | ||
1111 | free_netdev(dev); | ||
1112 | delete_unused_pvcs(hdlc); | ||
1113 | return result; | ||
1114 | } | ||
1115 | |||
1116 | if (register_netdevice(dev) != 0) { | 1109 | if (register_netdevice(dev) != 0) { |
1117 | free_netdev(dev); | 1110 | free_netdev(dev); |
1118 | delete_unused_pvcs(hdlc); | 1111 | delete_unused_pvcs(hdlc); |
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 7f5bb913c8b9..eec463f99c09 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c | |||
@@ -338,10 +338,6 @@ static int lapbeth_new_device(struct net_device *dev) | |||
338 | dev_hold(dev); | 338 | dev_hold(dev); |
339 | lapbeth->ethdev = dev; | 339 | lapbeth->ethdev = dev; |
340 | 340 | ||
341 | rc = dev_alloc_name(ndev, ndev->name); | ||
342 | if (rc < 0) | ||
343 | goto fail; | ||
344 | |||
345 | rc = -EIO; | 341 | rc = -EIO; |
346 | if (register_netdevice(ndev)) | 342 | if (register_netdevice(ndev)) |
347 | goto fail; | 343 | goto fail; |