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: [PATCH] Add fix for timer issue in bridge code (rhbz 980254)

---
 bridge-timer-fix.patch | 13 +++++++++++++
 kernel.spec            |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 bridge-timer-fix.patch

diff --git a/bridge-timer-fix.patch b/bridge-timer-fix.patch
new file mode 100644
index 000000000..888a6f009
--- /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);
+ 
diff --git a/kernel.spec b/kernel.spec
index c832eb950..c39fa225e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -784,6 +784,8 @@ Patch25052: HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
 #rhbz 880035
 Patch25053: bridge-only-expire-the-mdb-entry-when-query-is-received.patch
 Patch25054: bridge-send-query-as-soon-as-leave-is-received.patch
+#rhbz 980254
+Patch25061: bridge-timer-fix.patch
 
 #rhbz 977558
 Patch25055: ath3k-dont-use-stack-memory-for-DMA.patch
@@ -1501,6 +1503,7 @@ ApplyPatch HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
 #rhbz 880035
 ApplyPatch bridge-only-expire-the-mdb-entry-when-query-is-received.patch
 ApplyPatch bridge-send-query-as-soon-as-leave-is-received.patch
+ApplyPatch bridge-timer-fix.patch
 
 #rhbz 977558
 ApplyPatch ath3k-dont-use-stack-memory-for-DMA.patch
@@ -2305,6 +2308,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jul 05 2013 Josh Boyer <jwboyer@redhat.com>
+- Add fix for timer issue in bridge code (rhbz 980254)
+
 * Wed Jul 03 2013 Josh Boyer <jwboyer@redhat.com>
 - Add patches to fix iwl skb managment (rhbz 977040)