Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 15:11:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NET]: Remove double dev->flags checking when calling dev_close()

Browse Source 
The unregister_netdevice() and dev_change_net_namespace()
both check for dev->flags to be IFF_UP before calling the
dev_close(), but the dev_close() checks for IFF_UP itself,
so remove those unneeded checks.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2007-10-10 02:49:09 -07:00 committed by David S. Miller
parent 1c1e87edb9
commit 9b77265235
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/dev.c
View File

@ -3893,8 +3893,7 @@ void unregister_netdevice(struct net_device *dev)
BUG_ON(dev->reg_state != NETREG_REGISTERED); BUG_ON(dev->reg_state != NETREG_REGISTERED);
/* If device is running, close it first. */ /* If device is running, close it first. */
if (dev->flags & IFF_UP) dev_close(dev);
dev_close(dev);
/* And unlink it from device chain. */ /* And unlink it from device chain. */
unlist_netdevice(dev); unlist_netdevice(dev);
@ -4018,8 +4017,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
*/ */
/* If device is running close it first. */ /* If device is running close it first. */
if (dev->flags & IFF_UP) dev_close(dev);
dev_close(dev);
/* And unlink it from device chain */ /* And unlink it from device chain */
err = -ENODEV; err = -ENODEV;