---

yaml --- r: 321968 b: refs/heads/master c: d30362c h: refs/heads/master v: v3
git-mirror · Aug 14, 2012 · 8b90140 · 8b90140
1 parent 4e7346c
commit 8b90140
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2899656b494dcd118123af1126826b115c8ea6f9
+refs/heads/master: d30362c0712eb567334b3b66de7c40d4372f2c6f
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -427,6 +427,10 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
 	if (!p || p->br != br)
 		return -EINVAL;
 
+	/* Since more than one interface can be attached to a bridge,
+	 * there still maybe an alternate path for netconsole to use;
+	 * therefore there is no reason for a NETDEV_RELEASE event.
+	 */
 	del_nbp(p);
 
 	spin_lock_bh(&br->lock);