commit 64c363146fe8b4b26285d36fad0fc01b9c8c1285
author José Adolfo Galdámez <josegalre@pac-rom.com> Mon Sep 21 22:00:27 2015 -0600
committer William Bellavance <flintman@flintmancomputers.com> Wed Feb 10 20:03:50 2016 -0500
tree f4597aeccc6d37aadbf3a719dfefc62632e4ee10
parent 900469d0b0c337db19908f77d172f4b17f4573ba

Merge tag 'v3.4.109' into mm-6.0

Change-Id: I93b29443377e338fc5d3b031b130da720f788879
Signed-off-by: José Adolfo Galdámez <josegalre@pac-rom.com>

net/bridge/br_multicast.c

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 0b870d7..a41051a 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -972,7 +972,7 @@
 		}
 
 		err = br_ip6_multicast_add_group(br, port, &grec->grec_mca);
-		if (!err)
+		if (err)
 			break;
 	}
 
@@ -991,6 +991,9 @@
 	struct net_bridge_port *p;
 	struct hlist_node *n, *slot = NULL;
 
+	if (!hlist_unhashed(&port->rlist))
+		return;
+
 	hlist_for_each_entry(p, n, &br->router_list, rlist) {
 		if ((unsigned long) port >= (unsigned long) p)
 			break;
@@ -1018,12 +1021,8 @@
 	if (port->multicast_router != 1)
 		return;
 
-	if (!hlist_unhashed(&port->rlist))
-		goto timer;
-
 	br_multicast_add_router(br, port);
 
-timer:
 	mod_timer(&port->multicast_router_timer,
 		  now + br->multicast_querier_interval);
 }