---

yaml --- r: 233452 b: refs/heads/master c: f87e6f4 h: refs/heads/master v: v3
git-mirror · Feb 18, 2011 · 68c8cfa · 68c8cfa
1 parent 9554220
commit 68c8cfa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 214f45c91bbda8321d9676f1197238e4663edcbb
+refs/heads/master: f87e6f47933e3ebeced9bb12615e830a72cedce4
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1280,10 +1280,13 @@ static int __dev_close_many(struct list_head *head)
 
 static int __dev_close(struct net_device *dev)
 {
+	int retval;
 	LIST_HEAD(single);
 
 	list_add(&dev->unreg_list, &single);
-	return __dev_close_many(&single);
+	retval = __dev_close_many(&single);
+	list_del(&single);
+	return retval;
 }
 
 int dev_close_many(struct list_head *head)
@@ -1325,7 +1328,7 @@ int dev_close(struct net_device *dev)
 
 	list_add(&dev->unreg_list, &single);
 	dev_close_many(&single);
-
+	list_del(&single);
 	return 0;
 }
 EXPORT_SYMBOL(dev_close);