From 56c71a0b7e35e95dd15696ead04c0ca22dd4fb10 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 10 Oct 2007 02:49:09 -0700 Subject: [PATCH] --- yaml --- r: 67040 b: refs/heads/master c: 9b7726523523472ead660b1d45df29dcaf6cc5c0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c249a5461714..2ad257a7f2a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c1e87edb9aa38b9e1ae807a6d88fcfd350a55c0 +refs/heads/master: 9b7726523523472ead660b1d45df29dcaf6cc5c0 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index e7e728aea9f3..1e169a541ce7 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3893,8 +3893,7 @@ void unregister_netdevice(struct net_device *dev) BUG_ON(dev->reg_state != NETREG_REGISTERED); /* If device is running, close it first. */ - if (dev->flags & IFF_UP) - dev_close(dev); + dev_close(dev); /* And unlink it from device chain. */ 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 (dev->flags & IFF_UP) - dev_close(dev); + dev_close(dev); /* And unlink it from device chain */ err = -ENODEV;