|
 |
69c0bf4 |
From 6b7df111ece130fa979a0c4f58e53674c1e47d3e Mon Sep 17 00:00:00 2001
|
|
|
69c0bf4 |
From: Cong Wang <amwang@redhat.com>
|
|
|
69c0bf4 |
Date: Tue, 21 May 2013 21:52:56 +0000
|
|
|
69c0bf4 |
Subject: bridge: send query as soon as leave is received
|
|
|
69c0bf4 |
|
|
|
69c0bf4 |
Continue sending queries when leave is received if the user marks
|
|
|
69c0bf4 |
it as a querier.
|
|
|
69c0bf4 |
|
|
|
69c0bf4 |
Cc: Herbert Xu <herbert@gondor.apana.org.au>
|
|
|
69c0bf4 |
Cc: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
69c0bf4 |
Cc: "David S. Miller" <davem@davemloft.net>
|
|
|
69c0bf4 |
Cc: Adam Baker <linux@baker-net.org.uk>
|
|
|
69c0bf4 |
Signed-off-by: Cong Wang <amwang@redhat.com>
|
|
|
69c0bf4 |
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
|
69c0bf4 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
69c0bf4 |
---
|
|
|
69c0bf4 |
(limited to 'net/bridge')
|
|
|
69c0bf4 |
|
|
|
69c0bf4 |
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
|
|
|
69c0bf4 |
index 40bda80..37a4676 100644
|
|
|
69c0bf4 |
--- a/net/bridge/br_multicast.c
|
|
|
69c0bf4 |
+++ b/net/bridge/br_multicast.c
|
|
|
69c0bf4 |
@@ -1250,6 +1250,32 @@ static void br_multicast_leave_group(struct net_bridge *br,
|
|
|
69c0bf4 |
if (!mp)
|
|
|
69c0bf4 |
goto out;
|
|
|
69c0bf4 |
|
|
|
69c0bf4 |
+ if (br->multicast_querier &&
|
|
|
69c0bf4 |
+ !timer_pending(&br->multicast_querier_timer)) {
|
|
|
69c0bf4 |
+ __br_multicast_send_query(br, port, &mp->addr);
|
|
|
69c0bf4 |
+
|
|
|
69c0bf4 |
+ time = jiffies + br->multicast_last_member_count *
|
|
|
69c0bf4 |
+ br->multicast_last_member_interval;
|
|
|
69c0bf4 |
+ mod_timer(port ? &port->multicast_query_timer :
|
|
|
69c0bf4 |
+ &br->multicast_query_timer, time);
|
|
|
69c0bf4 |
+
|
|
|
69c0bf4 |
+ for (p = mlock_dereference(mp->ports, br);
|
|
|
69c0bf4 |
+ p != NULL;
|
|
|
69c0bf4 |
+ p = mlock_dereference(p->next, br)) {
|
|
|
69c0bf4 |
+ if (p->port != port)
|
|
|
69c0bf4 |
+ continue;
|
|
|
69c0bf4 |
+
|
|
|
69c0bf4 |
+ if (!hlist_unhashed(&p->mglist) &&
|
|
|
69c0bf4 |
+ (timer_pending(&p->timer) ?
|
|
|
69c0bf4 |
+ time_after(p->timer.expires, time) :
|
|
|
69c0bf4 |
+ try_to_del_timer_sync(&p->timer) >= 0)) {
|
|
|
69c0bf4 |
+ mod_timer(&p->timer, time);
|
|
|
69c0bf4 |
+ }
|
|
|
69c0bf4 |
+
|
|
|
69c0bf4 |
+ break;
|
|
|
69c0bf4 |
+ }
|
|
|
69c0bf4 |
+ }
|
|
|
69c0bf4 |
+
|
|
|
69c0bf4 |
if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) {
|
|
|
69c0bf4 |
struct net_bridge_port_group __rcu **pp;
|
|
|
69c0bf4 |
|
|
|
69c0bf4 |
--
|
|
|
69c0bf4 |
cgit v0.9.2
|