Commit 9b772652 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

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

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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c1e87ed
...@@ -3893,8 +3893,7 @@ void unregister_netdevice(struct net_device *dev) ...@@ -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 ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment