---

yaml --- r: 98759 b: refs/heads/master c: ab1b204 h: refs/heads/master i: 98757: abfc084 98755: 690ead7 98751: 9b6ab53 v: v3
git-mirror · Jul 3, 2008 · 30e51f9 · 30e51f9
1 parent 7cc10a3
commit 30e51f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 374e7b59498ce0785b3727794b351221528a5159
+refs/heads/master: ab1b20467cd2214ad89a95d007047cd2a6b5bf5d
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -442,12 +442,16 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
 
 void __exit br_cleanup_bridges(void)
 {
-	struct net_device *dev, *nxt;
+	struct net_device *dev;
 
 	rtnl_lock();
-	for_each_netdev_safe(&init_net, dev, nxt)
-		if (dev->priv_flags & IFF_EBRIDGE)
+restart:
+	for_each_netdev(&init_net, dev) {
+		if (dev->priv_flags & IFF_EBRIDGE) {
 			del_br(dev->priv);
+			goto restart;
+		}
+	}
 	rtnl_unlock();
 
 }