diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-11-17 16:41:58 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:16:37 -0500 |
commit | 88041b79f864dcd7f95e1d594eba683244dd968a (patch) | |
tree | dddb140e2f6e3526ba43630956e5f9e3e2187ea3 | |
parent | 5ac366152a44da60c22c08df619012b1e3bc1adb (diff) |
[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>
-rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 0 insertions, 9 deletions
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) | |||
3035 | goto out; | 3035 | goto out; |
3036 | } | 3036 | } |
3037 | 3037 | ||
3038 | /* | ||
3039 | * Back compatibility hook. Kill this one in 2.5 | ||
3040 | */ | ||
3041 | if (dev->name[0] == 0 || dev->name[0] == ' ') { | ||
3042 | err = dev_alloc_name(dev, "eth%d"); | ||
3043 | if (err < 0) | ||
3044 | goto out; | ||
3045 | } | ||
3046 | |||
3047 | err = register_netdevice(dev); | 3038 | err = register_netdevice(dev); |
3048 | out: | 3039 | out: |
3049 | rtnl_unlock(); | 3040 | rtnl_unlock(); |