Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 8 deletions

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)
         hdlc_device *hdlc = dev_to_hdlc(frad);
         pvc_device *pvc;
         struct net_device *dev;
-        int result, used;
+        int used;
 
         if ((pvc = add_pvc(frad, dlci)) == NULL) {
                 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)
         dev->tx_queue_len = 0;
         dev->ml_priv = pvc;
 
-        result = dev_alloc_name(dev, dev->name);
-        if (result < 0) {
-                free_netdev(dev);
-                delete_unused_pvcs(hdlc);
-                return result;
-        }
-
         if (register_netdevice(dev) != 0) {
                 free_netdev(dev);
                 delete_unused_pvcs(hdlc);