summaryrefslogtreecommitdiffstats
path: root/bridge-timer-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'bridge-timer-fix.patch')
-rw-r--r--bridge-timer-fix.patch13
1 files changed, 13 insertions, 0 deletions
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);
+