update to vzkernel-2.6.32-042stab113.12.src.rpm

[pve-kernel-2.6.32.git] / 0002-bridge-send-query-as-soon-as-leave-is-received.patch

From fa6209a8834a92dc83dd31451738cb6a46c18126 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Mon, 3 Jun 2013 17:35:42 +0200
Subject: [PATCH 2/2] bridge: send query as soon as leave is received

Continue sending queries when leave is received if the user marks it as a querier.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 net/bridge/br_multicast.c |   25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index ceb364a..cb308ff 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1249,6 +1249,8 @@ static void br_multicast_leave_group(struct net_bridge *br,
 	struct net_bridge_mdb_htable *mdb;
 	struct net_bridge_mdb_entry *mp;
 	struct net_bridge_port_group *p;
+        struct net_bridge_port_group **pp;
+
 	unsigned long now;
 	unsigned long time;
 
@@ -1263,6 +1265,29 @@ static void br_multicast_leave_group(struct net_bridge *br,
 	if (!mp)
 		goto out;
 
+	if (br->multicast_querier &&
+	    !timer_pending(&br->multicast_querier_timer)) {
+		__br_multicast_send_query(br, port, &mp->addr);
+
+		time = jiffies + br->multicast_last_member_count *
+				 br->multicast_last_member_interval;
+		mod_timer(port ? &port->multicast_query_timer :
+				 &br->multicast_query_timer, time);
+
+		for (pp = &mp->ports; (p = *pp); pp = &p->next) {
+			if (p->port != port)
+				continue;
+
+			if (!hlist_unhashed(&p->mglist) &&
+			    (timer_pending(&p->timer) ?
+			     time_after(p->timer.expires, time) :
+			     try_to_del_timer_sync(&p->timer) >= 0)) {
+				mod_timer(&p->timer, time);
+			}
+
+			break;
+		}
+	}
 	now = jiffies;
 	time = now + br->multicast_last_member_count *
 		     br->multicast_last_member_interval;
-- 
1.7.10.4