From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 17 Nov 2006 21:41:58 +0000 (-0800)
Subject: [PATCH] netdev: don't allow register_netdev with blank name
X-Git-Tag: v2.6.20-rc1~15^2~9^2~464^2~22
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=88041b79f864dcd7f95e1d594eba683244dd968a;p=powerpc.git

[PATCH] netdev: don't allow register_netdev with blank name

This bit of old backwards compatibility cruft can be removed in 2.6.20.
If there is still an device that calls register_netdev()
with a zero or blank name, it will get -EINVAL from register_netdevice().

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index 81c426adcd..411c2428d2 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3035,15 +3035,6 @@ int register_netdev(struct net_device *dev)
 			goto out;
 	}
 	
-	/*
-	 * Back compatibility hook. Kill this one in 2.5
-	 */
-	if (dev->name[0] == 0 || dev->name[0] == ' ') {
-		err = dev_alloc_name(dev, "eth%d");
-		if (err < 0)
-			goto out;
-	}
-
 	err = register_netdevice(dev);
 out:
 	rtnl_unlock();