diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2007-02-07 00:09:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 12:39:06 -0800 |
| commit | 22f8cde5bc336fd19603bb8c4572b33d14f14f87 (patch) | |
| tree | 7a566269b9d294a1a90e8368a005e1b3fbc5e984 /net/core/dev.c | |
| parent | f48d5ff1e44562a0ee87ce8ea3b798ce9d84370d (diff) | |
| download | kernel_samsung_tuna-22f8cde5bc336fd19603bb8c4572b33d14f14f87.zip kernel_samsung_tuna-22f8cde5bc336fd19603bb8c4572b33d14f14f87.tar.gz kernel_samsung_tuna-22f8cde5bc336fd19603bb8c4572b33d14f14f87.tar.bz2 | |
[NET]: unregister_netdevice as void
There was no real useful information from the unregister_netdevice() return
code, the only error occurred in a situation that was a driver bug. So
change it to a void function.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 455d589..1e94a1b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3247,7 +3247,7 @@ void synchronize_net(void) * unregister_netdev() instead of this. */ -int unregister_netdevice(struct net_device *dev) +void unregister_netdevice(struct net_device *dev) { struct net_device *d, **dp; @@ -3258,7 +3258,9 @@ int unregister_netdevice(struct net_device *dev) if (dev->reg_state == NETREG_UNINITIALIZED) { printk(KERN_DEBUG "unregister_netdevice: device %s/%p never " "was registered\n", dev->name, dev); - return -ENODEV; + + WARN_ON(1); + return; } BUG_ON(dev->reg_state != NETREG_REGISTERED); @@ -3280,11 +3282,7 @@ int unregister_netdevice(struct net_device *dev) break; } } - if (!d) { - printk(KERN_ERR "unregister net_device: '%s' not found\n", - dev->name); - return -ENODEV; - } + BUG_ON(!d); dev->reg_state = NETREG_UNREGISTERING; @@ -3316,7 +3314,6 @@ int unregister_netdevice(struct net_device *dev) synchronize_net(); dev_put(dev); - return 0; } /** |