From 8fb285bdac75a903894b65ca8a9ef1172d37aeb4 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Fri, 5 Jul 2013 08:57:12 -0400
Subject: Add fix for timer issue in bridge code (rhbz 980254)

---
 bridge-timer-fix.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bridge-timer-fix.patch

(limited to 'bridge-timer-fix.patch')

diff --git a/bridge-timer-fix.patch b/bridge-timer-fix.patch
new file mode 100644
index 00000000..888a6f00
--- /dev/null
+++ b/bridge-timer-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
+index d6448e3..aadb596 100644
+--- a/net/bridge/br_multicast.c
++++ b/net/bridge/br_multicast.c
+@@ -269,7 +269,7 @@ static void br_multicast_del_pg(struct net_bridge *br,
+ 		del_timer(&p->timer);
+ 		call_rcu_bh(&p->rcu, br_multicast_free_pg);
+ 
+-		if (!mp->ports && !mp->mglist &&
++		if (!mp->ports && !mp->mglist && mp->timer_armed &&
+ 		    netif_running(br->dev))
+ 			mod_timer(&mp->timer, jiffies);
+ 
-- 
cgit