summaryrefslogtreecommitdiffstats
path: root/bridge-timer-fix.patch
blob: 888a6f009864716366c97745cb0098546f1f1e31 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
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);