From 8b90140e4116e5de475f36ab5032ed44e3472030 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Fri, 10 Aug 2012 01:24:43 +0000
Subject: [PATCH] --- yaml --- r: 321968 b: refs/heads/master c:
 d30362c0712eb567334b3b66de7c40d4372f2c6f h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/bridge/br_if.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0ffe22445b5..7d3cb70a6d17 100644
--- 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
index 171fd6b9bfe6..1c8fdc3558cd 100644
--- 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);