[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1367220392-17496-3-git-send-email-amwang@redhat.com>
Date: Mon, 29 Apr 2013 15:26:32 +0800
From: Cong Wang <amwang@...hat.com>
To: netdev@...r.kernel.org
Cc: Herbert Xu <herbert@...dor.hengli.com.au>,
Stephen Hemminger <stephen@...workplumber.org>,
"David S. Miller" <davem@...emloft.net>,
Adam Baker <linux@...er-net.org.uk>,
Cong Wang <amwang@...hat.com>
Subject: [Patch net-next 3/3] bridge: send query as soon as leave is received
From: Cong Wang <amwang@...hat.com>
Continue sending queries when leave is received if the user marks
it as a querier.
Cc: Herbert Xu <herbert@...dor.apana.org.au>
Cc: Stephen Hemminger <stephen@...workplumber.org>
Cc: "David S. Miller" <davem@...emloft.net>
Cc: Adam Baker <linux@...er-net.org.uk>
Signed-off-by: Cong Wang <amwang@...hat.com>
---
net/bridge/br_multicast.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index a821a4e..03a8f2b 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1246,6 +1246,17 @@ static void br_multicast_leave_group(struct net_bridge *br,
if (!mp)
goto out;
+ if (br->multicast_querier) {
+ mod_timer(&br->multicast_query_timer, jiffies);
+ list_for_each_entry(port, &br->port_list, list) {
+ if (port->state == BR_STATE_DISABLED ||
+ port->state == BR_STATE_BLOCKING)
+ continue;
+
+ __br_multicast_enable_port(port);
+ }
+ }
+
if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) {
struct net_bridge_port_group __rcu **pp;
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists