From 376f2e1eb9881e5ae634aaaec9a7438ade73233d Mon Sep 17 00:00:00 2001
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Sat, 13 Sep 2008 15:06:42 -0400
Subject: [PATCH] --- yaml --- r: 111804 b: refs/heads/master c:
 7c0965e614f076331bf4628fae005c844d2f1f69 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/tulip/de2104x.c | 1 -
 trunk/net/core/dev.c              | 8 --------
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 411fe5e88a1f..5577519a19d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ca4a2cc1454cf633a1e0796b7ef39d937b87ec
+refs/heads/master: 7c0965e614f076331bf4628fae005c844d2f1f69
diff --git a/trunk/drivers/net/tulip/de2104x.c b/trunk/drivers/net/tulip/de2104x.c
index 9281d06d5aaa..f54c45049d50 100644
--- a/trunk/drivers/net/tulip/de2104x.c
+++ b/trunk/drivers/net/tulip/de2104x.c
@@ -1418,7 +1418,6 @@ static int de_close (struct net_device *dev)
 
 	de_free_rings(de);
 	de_adapter_sleep(de);
-	pci_disable_device(de->pdev);
 	return 0;
 }
 
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index a90737fe2472..e91390533999 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -967,14 +967,6 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len)
 	if (len >= IFALIASZ)
 		return -EINVAL;
 
-	if (!len) {
-		if (dev->ifalias) {
-			kfree(dev->ifalias);
-			dev->ifalias = NULL;
-		}
-		return 0;
-	}
-
 	dev->ifalias = krealloc(dev->ifalias, len+1, GFP_KERNEL);
 	if (!dev->ifalias)
 		return -ENOMEM;