---

yaml --- r: 121722 b: refs/heads/master c: d0c082c h: refs/heads/master v: v3
git-mirror · Nov 5, 2008 · 747fee3 · 747fee3
1 parent 052939f
commit 747fee3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 270acefafeb74ce2fe93d35b75733870bf1e11e7
+refs/heads/master: d0c082cea6dfb9b674b4f6e1e84025662dbd24e8
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -4852,6 +4852,12 @@ static void __net_exit default_device_exit(struct net *net)
 		if (dev->features & NETIF_F_NETNS_LOCAL)
 			continue;
 
+		/* Delete virtual devices */
+		if (dev->rtnl_link_ops && dev->rtnl_link_ops->dellink) {
+			dev->rtnl_link_ops->dellink(dev);
+			continue;
+		}
+
 		/* Push remaing network devices to init_net */
 		snprintf(fb_name, IFNAMSIZ, "dev%d", dev->ifindex);
 		err = dev_change_net_namespace(dev, &init_net, fb_name);