From 7d6a91da2fa38b0601a5066e4e234e443b7472a6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 24 Sep 2008 16:09:13 -0700
Subject: [PATCH] --- yaml --- r: 111878 b: refs/heads/master c:
 152cbcf94baec68b45832db5024184906ab798b1 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1d726d6222ae..9c2e81011c2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa53ebac42d3de04619c813f5f6628ca2a7ce97f
+refs/heads/master: 152cbcf94baec68b45832db5024184906ab798b1
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index e91390533999..a90737fe2472 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -967,6 +967,14 @@ 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;