---

yaml --- r: 67040 b: refs/heads/master c: 9b77265 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 56c71a0 · 56c71a0
1 parent cb7b42b
commit 56c71a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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;