Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

diff --git a/net/core/dev.c b/net/core/dev.c
index e91390533999fe35e2609efbaf07e10c24426d59..a90737fe24726222ecffba1f63682337c89bf1bb 100644 (file)
--- a/net/core/dev.c
+++ b/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;