---

yaml --- r: 203950 b: refs/heads/master c: 3a7fda0 h: refs/heads/master v: v3
git-mirror · Jul 31, 2010 · 7a65bc7 · 7a65bc7
1 parent 6d5ad90
commit 7a65bc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de140b0d511ad86a5dd0888c9095ae030ada2e86
+refs/heads/master: 3a7fda06ba48e97650fe44ea8e8a7cc385e1c100
diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c
@@ -1728,20 +1728,19 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
 int br_multicast_toggle(struct net_bridge *br, unsigned long val)
 {
 	struct net_bridge_port *port;
-	int err = -ENOENT;
+	int err = 0;
 
 	spin_lock(&br->multicast_lock);
-	if (!netif_running(br->dev))
-		goto unlock;
-
-	err = 0;
 	if (br->multicast_disabled == !val)
 		goto unlock;
 
 	br->multicast_disabled = !val;
 	if (br->multicast_disabled)
 		goto unlock;
 
+	if (!netif_running(br->dev))
+		goto unlock;
+
 	if (br->mdb) {
 		if (br->mdb->old) {
 			err = -EEXIST;